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-12-29 20:50:28 +08:00
parent b7b57d04d0
commit a929635bfc
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java
View File

@ -97,7 +97,7 @@ import static com.suisung.mall.common.utils.I18nUtil._;
@Service @Service
public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseMapper, AccountUserBase> implements AccountUserBaseService { public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseMapper, AccountUserBase> implements AccountUserBaseService {
private final String VERIFY_CODE_KEY = "register:verifyCode:"; private final String VERIFY_CODE_KEY = RedisConstant.VERIFY_CODE_KEY; //"register:verifyCode:";
private final Logger logger = LoggerFactory.getLogger(AccountUserBaseServiceImpl.class); private final Logger logger = LoggerFactory.getLogger(AccountUserBaseServiceImpl.class);
@Autowired @Autowired
private AuthService authService; private AuthService authService;

2
mall-common/src/main/java/com/suisung/mall/common/constant/RedisConstant.java
View File

@ -44,4 +44,6 @@ public class RedisConstant {
// 预约订单任务新增键 // 预约订单任务新增键
public static final String Order_Booking_Task_Key = ConstantRedis.Cache_NameSpace + "new:order:booking:task:"; public static final String Order_Booking_Task_Key = ConstantRedis.Cache_NameSpace + "new:order:booking:task:";
public static final String VERIFY_CODE_KEY = "register:verifyCode:";
} }

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

@ -698,12 +698,6 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
); );
} }
// 获取店铺信息
ShopStoreInfo storeInfo = shopStoreInfoService.getById(record.getStore_id());
if (storeInfo == null) {
log.warn("店铺信息异常，找不到对应店铺: storeId={}", record.getStore_id());
return CommonResult.success(null, "店铺信息异常！");
}
// 处理审核意见空值情况 // 处理审核意见空值情况
if (StrUtil.isBlank(record.getApproval_invalid_col())) { if (StrUtil.isBlank(record.getApproval_invalid_col())) {
@ -713,12 +707,21 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
// 尝试更新入驻表的合同下载地址和合同签署状态 // 尝试更新入驻表的合同下载地址和合同签署状态
updateMerchEntrySignedStatusAndContractDownloadUrl(record); updateMerchEntrySignedStatusAndContractDownloadUrl(record);
// 转换为JSONObject并添加额外属性
JSONObject retObj = JSONUtil.parseObj(record);
retObj.set("is_delivery_self", storeInfo.getIs_delivery_self());
log.debug("获取商家入驻申请详情成功: recordId={}, mobile={}", recordId, mobile); if (StrUtil.isNotBlank(record.getStore_id())) {
return CommonResult.success(retObj); // 转换为JSONObject并添加额外属性
JSONObject retObj = JSONUtil.parseObj(record);
// 获取店铺信息
ShopStoreInfo storeInfo = shopStoreInfoService.getById(record.getStore_id());
if (storeInfo != null && retObj != null) {
// log.warn("店铺信息异常，找不到对应店铺: storeId={}", record.getStore_id());
// return CommonResult.success(null, "店铺信息异常！");
retObj.set("is_delivery_self", storeInfo.getIs_delivery_self());
return CommonResult.success(record);
}
}
return CommonResult.success(record);
} catch (Exception e) { } catch (Exception e) {
log.error("获取商家入驻申请详情异常: recordId={}, mobile={}", recordId, mobile, e); log.error("获取商家入驻申请详情异常: recordId={}, mobile={}", recordId, mobile, e);