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

入驻流程 fix bug， 审核备注和创建店铺相关的问题

Browse Source
This commit is contained in:
Jack 2025-06-23 17:11:39 +08:00
parent 04157e9575
commit 4d05f5ad16
4 changed files with 152 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkServiceImpl.java
View File

@ -614,7 +614,6 @@ public class LklTkServiceImpl {
if (!success) {
return new JSONObject().set("code", "500").set("message", "更新商户号失败");
// throw new ApiException("更新商户号失败");
}
// 备注：RMK 采用拉卡拉的入网电子合同签署流程，暂停e签宝的电子合同生成流程

28
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
View File

@ -984,13 +984,13 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
* @param lklInnerMerNo 拉卡拉内部商户号
* @param lklMerCupNo 拉卡拉外部商户号
* @param termNos 拉卡拉分配的业务终端号
* @param lklAuditStatus 拉卡拉审核状态
* @param lklTkAuditStatus 拉卡拉审核状态
* @param approvalStatus 入驻材料审核状态
* @param lklTkRegNotifyReq 异步通知返回的请求数据
* @return
*/
@Override
public Boolean updateMerchEntryLklAuditStatusByLklMerCupNo(String lklInnerMerNo, String lklMerCupNo, String termNos, Integer lklAuditStatus, Integer approvalStatus, String lklTkRegNotifyReq) {
public Boolean updateMerchEntryLklAuditStatusByLklMerCupNo(String lklInnerMerNo, String lklMerCupNo, String termNos, Integer lklTkAuditStatus, Integer approvalStatus, String lklTkRegNotifyReq) {
if (StrUtil.isBlank(lklInnerMerNo)) {
return false;
}
@ -1007,8 +1007,8 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
updateWrapper.set("lkl_term_no", termNos);
}
if (ObjectUtil.isNotEmpty(lklAuditStatus)) {
updateWrapper.set("lkl_tk_audit_status", lklAuditStatus);
if (ObjectUtil.isNotEmpty(lklTkAuditStatus)) {
updateWrapper.set("lkl_tk_audit_status", lklTkAuditStatus);
}
if (ObjectUtil.isNotEmpty(approvalStatus)) {
@ -1303,6 +1303,25 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
.filter(StrUtil::isNotBlank)
.ifPresent(cupNo -> updateWrapper.eq("lkl_mer_cup_no", cupNo));
String approvalRemark = "";
if (hasEcSigned.equals(CommonConstant.Enable)) {
approvalRemark = "合同签署完成，商家信息正在提交审核，请耐心等待";
} else if (hasApplyMerchant.equals(CommonConstant.Enable)) {
approvalRemark = "商家资质审核通过，系统正在初始化店铺，请稍后操作";
} else if (storeStatus.equals(CommonConstant.Enable)) {
approvalRemark = "店铺创建成功，系统正在处理分账业务申请";
} else if (hasApplySplit.equals(CommonConstant.Enable)) {
approvalRemark = "分账业务申请已通过，系统正在处理接收方申请";
} else if (hasApplyReceiver.equals(CommonConstant.Enable)) {
approvalRemark = "分账接收方申请成功，系统正在处理接收方绑定";
} else if (hasBindReceiver.equals(CommonConstant.Enable)) {
approvalRemark = "分账接收方绑定成功，入驻流程即将完成";
}
if (StrUtil.isNotBlank(approvalRemark)) {
updateWrapper.set("approval_remark", approvalRemark);
}
// 4. 构建需要更新的字段和值的映射关系
Map<String, Integer> updateFieldMap = new LinkedHashMap<>();
updateFieldMap.put("approval_status", approvalStatus); // 审批状态
@ -1319,6 +1338,7 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
.filter(entry -> entry.getValue() != null && entry.getValue() > 0)
.forEach(entry -> updateWrapper.set(entry.getKey(), entry.getValue()));
// 6. 执行更新操作并返回结果
return update(updateWrapper);

12
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
View File

@ -3371,13 +3371,11 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
List<Integer> rights_group_id = shopStoreEmployeeRightsGroups.stream().map(s -> s.getRights_group_id()).collect(Collectors.toList());
if (CollUtil.isNotEmpty(rights_group_id)) {
// 初始化雇员信息
ShopStoreEmployee shopStoreEmployee = new ShopStoreEmployee();
shopStoreEmployee.setUser_id(userId);
shopStoreEmployee.setStore_id(storeId);
shopStoreEmployee.setRights_group_id(CollUtil.join(rights_group_id, ","));
shopStoreEmployee.setEmployee_is_admin(CommonConstant.USER_TYPE_ADMIN);
if (!shopStoreEmployeeService.saveOrUpdate(shopStoreEmployee)) {
UpdateWrapper<ShopStoreEmployee> queryWrapper = new UpdateWrapper<>();
queryWrapper.eq("user_id", userId).eq("store_id", storeId)
.set("rights_group_id", CollUtil.join(rights_group_id, ","))
.set("employee_is_admin", CommonConstant.USER_TYPE_ADMIN);
if (!shopStoreEmployeeService.update(queryWrapper)) {
throw new ApiException(I18nUtil._("设置店铺管理员权限失败"));
}

7
mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncThirdDataServiceImpl.java
View File

@ -152,6 +152,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
private ShopProductItemService shopProductItemService;
@Autowired
private ShopStoreActivityBaseService shopStoreActivityBaseService;
/**
* 批量保存商品的分类
*
@ -770,7 +771,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
for (Map.Entry<String, Integer> entry : stockDeltaMap.entrySet()) {
String productKey = entry.getKey();
Integer delta = entry.getValue();
if (StrUtil.isBlank(productKey) || delta == null) {
if (StrUtil.isBlank(productKey) || productKey.equals("0") || delta == null || delta.equals(0)) {
continue;
}
@ -908,6 +909,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
/**
* 批量新增或更新活动数据
*
* @param jsonArray
*/
private void batchSaveShopStoreActivityBase(JSONArray jsonArray, Integer storeId) {
@ -974,6 +976,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
* 将商品添加到活动
* 1、找出匹配的活动
* 2、新增商品到活动列表
*
* @param appKey
* @param sign
* @param activeJsonArray
@ -1001,6 +1004,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
/**
* 批量新增或更新活动商品数据
*
* @param jsonArray
*/
private void batchAddActiveShopBase(JSONArray jsonArray, Integer storeId) {
@ -1087,6 +1091,7 @@ public class SyncThirdDataServiceImpl extends SyncBaseThirdSxAbstract implements
* 一对多，如product_id:1002,item_number:120_121;数据格式为item_id,item_id item_unit_price,item_unit_price
* 最终组合item_id,item_id_item_unit_price,item_unit_price
* 满减的切割规则的itemid
*
* @param itemPrice
* @return
*/