backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商品映射新增参数传值

Browse Source
This commit is contained in:
liyj 2025-07-09 18:24:27 +08:00
parent 2329a017b2
commit d2b25780f5
6 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/ProductMappingController.java
View File

@ -186,8 +186,8 @@ public class ProductMappingController extends BaseControllerImpl {
*/
@ApiOperation(value = "自动计算并上架商品", notes = "自动计算并上架商品")
@RequestMapping(value = "/syncProductMaping", method = RequestMethod.PUT)
public CommonResult syncProductMaping() {
return productMappingService.syncAllProductMapping();
public CommonResult syncProductMaping(Integer storeId) {
return productMappingService.syncAllProductMapping(storeId);
}
/**

6
mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/StoreDbConfigController.java
View File

@ -103,12 +103,12 @@ public class StoreDbConfigController extends BaseControllerImpl {
/**
* 生产密钥，用来放到app/bin目录，替换原来的密钥
* @param syncApp
* @param storeDbConfig
* @return
*/
@ApiOperation(value = "客户端primaryKey.txt生产", notes = "密钥生成器")
@RequestMapping(value = "/getPrimaryKey", method = RequestMethod.PUT)
public String getPrimaryKey(@RequestBody SyncApp syncApp) {
return storeDbConfigService.getPrimaryKey(syncApp);
public String getPrimaryKey(@RequestBody StoreDbConfig storeDbConfig) {
return storeDbConfigService.getPrimaryKey(storeDbConfig);
}
}

2
mall-shop/src/main/java/com/suisung/mall/shop/sync/service/ProductMappingService.java
View File

@ -19,7 +19,7 @@ public interface ProductMappingService extends IBaseService<ProductMapping> {
Map getProductMapping(Integer storeId);
CommonResult syncAllProductMapping();
CommonResult syncAllProductMapping(Integer storeId);
CommonResult getSyncProductUnchecked(Integer storeId);

2
mall-shop/src/main/java/com/suisung/mall/shop/sync/service/StoreDbConfigService.java
View File

@ -28,7 +28,7 @@ public interface StoreDbConfigService extends IBaseService<StoreDbConfig> {
CommonResult updateStoreDbConfig(StoreDbConfig storeDbConfig);
CommonResult delStoreDbConfig(StoreDbConfig storeDbConfig);
String getPrimaryKey(SyncApp syncApp);
String getPrimaryKey(StoreDbConfig storeDbConfig);
Map getPriorityModeCachByStoreId(Integer storeId);

11
mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java
View File

@ -377,8 +377,10 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
}
@Override
public CommonResult syncAllProductMapping() {
Integer storeId= Integer.valueOf(Objects.requireNonNull(ContextUtil.getCurrentUser()).getStore_id());
public CommonResult syncAllProductMapping(Integer storeId) {
if(ObjectUtil.isEmpty(storeId)){
storeId= Integer.valueOf(Objects.requireNonNull(ContextUtil.getCurrentUser()).getStore_id());
}
QueryWrapper<StoreDbConfig> storeDbConfigQueryWrapper = new QueryWrapper<>();
storeDbConfigQueryWrapper.select("priority_mode");
storeDbConfigQueryWrapper.eq("store_id", storeId);
@ -401,8 +403,9 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
List<Future<?>> futures = new ArrayList<>();
for (int i=1;i<=pages;i++){
int finalI = i;
Integer finalStoreId = storeId;
futures.add(executor.submit(() -> {
this.computeProductMapping(shopProductBaseService.lists(queryWrapper, finalI,SHOPBASEPAGE).getRecords(),storeId,false);
this.computeProductMapping(shopProductBaseService.lists(queryWrapper, finalI,SHOPBASEPAGE).getRecords(), finalStoreId,false);
return "成功" + finalI;
}));
}
@ -423,7 +426,7 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
@Override
public CommonResult getSyncProductUnchecked(Integer storeId) {
if(ObjectUtil.isNull(storeId)){
if(ObjectUtil.isEmpty(storeId)){
storeId= Integer.valueOf(Objects.requireNonNull(ContextUtil.getCurrentUser()).getStore_id());
}
//找出范围内的规格产品

10
mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/StoreDbConfigServiceImpl.java
View File

@ -165,21 +165,21 @@ public class StoreDbConfigServiceImpl extends BaseServiceImpl<StoreDbConfigMappe
@Override
public String getPrimaryKey(SyncApp syncApp) {
public String getPrimaryKey(StoreDbConfig storeDbConfig) {
checked();
if(ObjectUtil.isEmpty(syncApp)){
if(ObjectUtil.isEmpty(storeDbConfig)){
throw new RuntimeException("对象不能为空");
}
if(ObjectUtil.isEmpty(syncApp.getStore_id())){
if(ObjectUtil.isEmpty(storeDbConfig.getStoreId())){
throw new RuntimeException("商店编号不能为空");
}
String storeId= getStoreId(syncApp.getStore_id());//保证不能跨数据操作
String storeId= getStoreId(storeDbConfig.getStoreId());//保证不能跨数据操作
ShopStoreBase shopStoreBase=shopStoreBaseService.get(Convert.toInt(storeId));
if(shopStoreBase==null){
throw new RuntimeException("商品不存在");
}
QueryWrapper<SyncApp> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("store_id", storeId);
queryWrapper.eq("store_id", Integer.valueOf(storeId));
SyncApp result= syncAppService.getOne(queryWrapper);
String primaryKey="";
try {