From 6d31d535d737ed26c4d9d61cd4e0b5483cb9b0ba Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 17 Sep 2025 19:44:00 +0800
Subject: [PATCH] Merge branch 'refs/heads/master' into xin
---
oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreServiceImpl.java b/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreServiceImpl.java
index 253d66c..b89bb58 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreServiceImpl.java
@@ -1,6 +1,7 @@
package com.oying.modules.pc.store.service.impl;
import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -20,6 +21,7 @@
import com.oying.utils.PageUtil;
import com.oying.utils.SecurityUtils;
import com.oying.utils.StringUtils;
+import com.oying.utils.enums.StoreRole;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -167,10 +169,16 @@
}
@Override
- public boolean updateAddress(Long storeId, String address, Long version) {
+ public boolean updateAddress(Long storeId, String address, Double longitude, Double latitude, Long version) {
Store existingStore = this.getOrThrow(storeId, version);
LambdaUpdateWrapper<Store> wrapper = this.createLambdaUpdateWrapper(storeId, existingStore.getVersion())
.set(Store::getAddress, address);
+ if (ObjectUtil.isNotEmpty(longitude)) {
+ wrapper.set(Store::getLongitude, longitude);
+ }
+ if (ObjectUtil.isNotEmpty(latitude)) {
+ wrapper.set(Store::getLatitude, latitude);
+ }
return update(wrapper);
}
@@ -225,6 +233,14 @@
}
@Override
+ public boolean updatePackagingFee(Long storeId, BigDecimal packagingFee, Long version) {
+ Store existingStore = this.getOrThrow(storeId, version);
+ LambdaUpdateWrapper<Store> wrapper = this.createLambdaUpdateWrapper(storeId, existingStore.getVersion())
+ .set(Store::getPackagingFee, packagingFee);
+ return update(wrapper);
+ }
+
+ @Override
public boolean updateStatus(Long storeId, Integer status, Long version) {
Store existingStore = this.getOrThrow(storeId, version);
LambdaUpdateWrapper<Store> wrapper = this.createLambdaUpdateWrapper(storeId, existingStore.getVersion())
@@ -247,7 +263,7 @@
StoreUser storeUser = new StoreUser();
storeUser.setStoreId(storeId);
storeUser.setUserId(SecurityUtils.getCurrentUserId());
- storeUser.setRoleType("");
+ storeUser.setRoleType(StoreRole.ADMIN.getRole());
storeUser.setPermissions("");
storeUserMapper.insert(storeUser);
return true;
--
Gitblit v1.9.3