update 修改字段名

jsowell-admin/src/main/java/com/jsowell/api/uniapp/PersonPileController.java

@@ -1,6 +1,5 @@
 package com.jsowell.api.uniapp;
 
-import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.jsowell.common.annotation.Anonymous;
 import com.jsowell.common.core.controller.BaseController;
@@ -8,11 +7,11 @@ import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.response.RestApiResponse;
+import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.dto.PileMemberBindingDTO;
 import com.jsowell.pile.dto.QueryPersonPileDTO;
 import com.jsowell.pile.service.IPileBasicInfoService;
-import com.jsowell.pile.service.IPileMemberRelationService;
+import com.jsowell.pile.service.IPileMerchantInfoService;
-import com.jsowell.pile.vo.uniapp.OrderVO;
 import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO;
 import com.jsowell.pile.vo.uniapp.PersonPileRealTimeVO;
 import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO;
@@ -34,15 +33,16 @@ import java.util.List;
 @RequestMapping("/uniapp/personalPile")
 public class PersonPileController extends BaseController {
 
-    @Autowired
-    private IPileMemberRelationService pileMemberRelationService;
-
     @Autowired
     private PileService pileService;
 
+    @Autowired
+    private IPileMerchantInfoService pileMerchantInfoService;
+
     @Autowired
     private IPileBasicInfoService pileBasicInfoService;
 
+
     /**
      * 用户绑定个人桩
      *
@@ -111,6 +111,13 @@ public class PersonPileController extends BaseController {
         logger.info("桩管理员下发个人桩 params: {}", JSONObject.toJSONString(dto));
         RestApiResponse<?> response = null;
         try {
+            String appId = request.getHeader("appId");
+            if (StringUtils.isNotBlank(appId)) {
+                String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(appId);
+                if (StringUtils.isNotBlank(firstLevelMerchantId)) {
+                    dto.setMerchantId(firstLevelMerchantId);
+                }
+            }
             String memberId = getMemberIdByAuthorization(request);
             dto.setMemberId(memberId);
             pileService.adminIssuePile(dto);

jsowell-pile/src/main/java/com/jsowell/pile/dto/PileMemberBindingDTO.java

@@ -35,5 +35,8 @@ public class PileMemberBindingDTO {
      */
     private String memberId;
 
+    /**
+     * 一级运营商id
+     */
     private String merchantId;
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java

@@ -163,8 +163,10 @@ public class PileAuthCardServiceImpl implements PileAuthCardService {
 
     @Override
     public int updateCardInfo(PileAuthCardDTO dto) {
+        // 通过运营商id获取一级运营商id
+        String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(dto.getMerchantId());
         // 通过手机号查询memberId
-        MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), dto.getMerchantId());
+        MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getPhoneNumber(), firstLevelMerchantId);
         if (memberBasicInfo == null) {
             // 为空则说明未查到该用户的注册信息
             throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER);
@@ -256,8 +258,10 @@ public class PileAuthCardServiceImpl implements PileAuthCardService {
     @Override
     public int bindAuthCard(PileAuthCardDTO dto) {
         String phoneNumber = dto.getPhoneNumber();
+        // 通过运营商id获取一级运营商id
+        String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(dto.getMerchantId());
         // 判断此用户是否已注册小程序账号
-        MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber, dto.getMerchantId());
+        MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber, firstLevelMerchantId);
         if (memberBasicInfo == null) {
             throw new BusinessException(ReturnCodeEnum.CODE_USER_IS_NOT_REGISTER);
         }