商家app接口，增加店铺自提字段

mall-shop/src/main/java/com/suisung/mall/shop/store/controller/mobile/ShopMchEntryController.java

@@ -62,7 +62,7 @@ public class ShopMchEntryController extends BaseControllerImpl {
     @ApiOperation(value = "获取商家入驻资料详情", notes = "获取商家入驻资料详情")
     @RequestMapping(value = "/detail", method = RequestMethod.POST)
     public CommonResult shopMerchEntryDetail(@RequestBody JSONObject jsonParam) {
-        return shopMchEntryService.shopMerchEntryDetail(null, jsonParam.getStr("mobile"), null);
+        return shopMchEntryService.shopMerchEntryDetail(jsonParam.getLong("mch_id"), jsonParam.getStr("mobile"), null);
     }
 
     @ApiOperation(value = "通过手机号mobile获取商家入驻审核状态", notes = "通过手机号获取商家入驻审核状态，远程调用用途")

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

@@ -30,6 +30,7 @@ import com.suisung.mall.common.modules.account.AccountUserBase;
 import com.suisung.mall.common.modules.lakala.LklLedgerEc;
 import com.suisung.mall.common.modules.store.ShopMchEntry;
 import com.suisung.mall.common.modules.store.ShopStoreEmployee;
+import com.suisung.mall.common.modules.store.ShopStoreInfo;
 import com.suisung.mall.common.pojo.to.AddressParseResultTO;
 import com.suisung.mall.common.utils.*;
 import com.suisung.mall.common.utils.phone.PhoneNumberUtils;
@@ -45,6 +46,7 @@ import com.suisung.mall.shop.store.mapper.ShopMchEntryMapper;
 import com.suisung.mall.shop.store.service.ShopMchEntryService;
 import com.suisung.mall.shop.store.service.ShopStoreBaseService;
 import com.suisung.mall.shop.store.service.ShopStoreEmployeeService;
+import com.suisung.mall.shop.store.service.ShopStoreInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.data.util.Pair;
@@ -97,6 +99,10 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
     @Resource
     private ShopBaseDistrictService shopBaseDistrictService;
 
+    @Lazy
+    @Resource
+    private ShopStoreInfoService shopStoreInfoService;
+
     /**
      * 获取店铺的经营类目列表
      *
@@ -594,48 +600,79 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
     /**
      * 通过 mobile 申请手机号或自增 ID 获取商家入驻申请详情
      *
-     * @param recordId
+     * @param recordId           商家入驻记录ID（可选）
-     * @param mobile
+     * @param mobile             商家登录手机号（可选）
-     * @param approvalStatusList
+     * @param approvalStatusList 审批状态列表过滤条件（可选）
-     * @return
+     * @return CommonResult 包含商家入驻申请详情的响应结果
      */
     @Override
     public CommonResult shopMerchEntryDetail(Long recordId, String mobile, List<Integer> approvalStatusList) {
-        // 检查登录用户是否有管理权限或者是用户自己
+        log.debug("获取商家入驻申请详情开始: recordId={}, mobile={}", recordId, mobile);
 
-        // approvalStatus 入驻商家的审批状态：1-已通过；2-未通过；3-待审核；
+        // 参数校验：recordId 和 mobile 至少提供一个
         if (ObjectUtil.isEmpty(recordId) && StrUtil.isBlank(mobile)) {
+            log.warn("获取商家入驻详情失败：缺少必要参数 recordId 或 mobile");
             return CommonResult.failed("缺少必要参数！");
         }
 
-        QueryWrapper<ShopMchEntry> queryWrapper = new QueryWrapper<>();
+        try {
-        if (ObjectUtil.isNotEmpty(recordId)) {
+            // 构建查询条件
-            queryWrapper.eq("id", recordId);
+            QueryWrapper<ShopMchEntry> queryWrapper = new QueryWrapper<>();
-        }
 
-        if (StrUtil.isNotBlank(mobile)) {
+            // 根据ID查询
-            queryWrapper.eq("login_mobile", mobile);
+            if (ObjectUtil.isNotEmpty(recordId)) {
-        }
+                queryWrapper.eq("id", recordId);
+            }
 
-        if (CollectionUtil.isNotEmpty(approvalStatusList)) {
+            // 根据手机号查询
-            queryWrapper.in("approval_status", approvalStatusList);
+            if (StrUtil.isNotBlank(mobile)) {
-        }
+                queryWrapper.eq("login_mobile", mobile);
-        queryWrapper.orderByDesc("id");
+            }
-        List<ShopMchEntry> recordList = list(queryWrapper);
-        if (CollectionUtil.isEmpty(recordList)) {
-            return CommonResult.success(new JSONObject().set("approval_status", CommonConstant.MCH_APPR_STA_NONE), "请求成功！");
-        }
 
-        ShopMchEntry record = recordList.get(0);
+            // 状态过滤条件
-        // 审核意见空值，返回"[]"
+            if (CollectionUtil.isNotEmpty(approvalStatusList)) {
-        if (StrUtil.isBlank(record.getApproval_invalid_col())) {
+                queryWrapper.in("approval_status", approvalStatusList);
-            record.setApproval_invalid_col("[]");
+            }
+
+            // 按ID倒序排列，获取最新一条记录
+            queryWrapper.orderByDesc("id");
+            ShopMchEntry record = getOne(queryWrapper);
+
+            // 如果没有找到记录，返回默认的成功结果
+            if (ObjectUtil.isEmpty(record)) {
+                log.debug("未找到商家入驻记录: recordId={}, mobile={}", recordId, mobile);
+                return CommonResult.success(
+                        new JSONObject().set("approval_status", CommonConstant.MCH_APPR_STA_NONE),
+                        "请求成功！"
+                );
+            }
+
+            // 获取店铺信息
+            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())) {
+                record.setApproval_invalid_col("[]");
+            }
+
+            // 尝试更新入驻表的合同下载地址和合同签署状态
+            updateMerchEntrySignedStatusAndContractDownloadUrl(record);
+
+            // 转换为JSONObject并添加额外属性
+            JSONObject retObj = JSONUtil.parseObj(record);
+            retObj.set("is_delivery_self", storeInfo.getIs_delivery_self());
+
+            log.debug("获取商家入驻申请详情成功: recordId={}, mobile={}", recordId, mobile);
+            return CommonResult.success(retObj);
+
+        } catch (Exception e) {
+            log.error("获取商家入驻申请详情异常: recordId={}, mobile={}", recordId, mobile, e);
+            return CommonResult.failed("系统异常，请稍后重试");
         }
-
-        // 试试更新入驻表的合同下载地址和合同签署状态
-        updateMerchEntrySignedStatusAndContractDownloadUrl(record);
-
-        return CommonResult.success(record);
     }