单位查询返回手机号及账号修改修复

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/client/PmsClient.java

@@ -37,11 +37,11 @@ public class PmsClient {
     }
 
 
-    public Integer removeMallGoods(Integer id, String token) {
+    public Integer removeMallGoods(Integer id, Integer companyInfoId, String token) {
         HttpHeaders headers = new HttpHeaders();
         headers.add("token", token);
         HttpEntity<String> entity = new HttpEntity<>(null, headers);
-        ResponseEntity<ResultBody> responseEntity = restTemplate.exchange(pmsAppUri + "/pms/mall/goods/feignRemoveGoodsByBackUserAccountId" + "?id=" + id, HttpMethod.GET, entity, ResultBody.class);
+        ResponseEntity<ResultBody> responseEntity = restTemplate.exchange(pmsAppUri + "/pms/mall/goods/feignRemoveGoodsByBackUserAccountId" + "?id=" + id + "&companyInfoId=" + companyInfoId, HttpMethod.GET, entity, ResultBody.class);
         ResultBody body = responseEntity.getBody();
         if (body.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
             return 1;

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CompanyAuthController.java

@@ -2,9 +2,7 @@ package com.mmc.iuav.user.controller;
 
 import com.mmc.iuav.group.Insert;
 import com.mmc.iuav.response.ResultBody;
-import com.mmc.iuav.user.model.vo.AppUserSucVO;
 import com.mmc.iuav.user.model.vo.CompanyAuthVO;
-import com.mmc.iuav.user.model.vo.WxLoginVO;
 import com.mmc.iuav.user.service.CompanyAuthService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,29 +18,29 @@ import javax.servlet.http.HttpServletRequest;
 @Api(tags = "企业认证相关")
 @RequestMapping("/company-auth/")
 @RestController
-public class CompanyAuthController extends BaseController{
+public class CompanyAuthController extends BaseController {
 
     @Autowired
     private CompanyAuthService companyAuthService;
 
     @ApiOperation(value = "提交企业认证")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("add")
-    public ResultBody add(@Validated(value = {Insert.class})@RequestBody CompanyAuthVO companyAuthVO, HttpServletRequest request){
+    public ResultBody add(@Validated(value = {Insert.class}) @RequestBody CompanyAuthVO companyAuthVO, HttpServletRequest request) {
         Integer userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
         companyAuthVO.setUserAccountId(userAccountId);
         return companyAuthService.add(companyAuthVO);
     }
 
     @ApiOperation(value = "企业工商模糊搜索")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("fuzzyQueryCompany")
     public ResultBody fuzzyQueryCompany(@ApiParam(value = "企业名称", required = true) @RequestParam String searchKey) {
         return companyAuthService.fuzzyQueryCompany(searchKey);
     }
 
     @ApiOperation(value = "企业认证详情")
-    @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = CompanyAuthVO.class) })
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = CompanyAuthVO.class)})
     @GetMapping("getCompanyAuthInfo")
     public ResultBody getCompanyAuthInfo(@RequestParam Integer userAccountId) {
         return ResultBody.success(companyAuthService.getCompanyAuthByUId(userAccountId));

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/CompanyAuthService.java

@@ -10,6 +10,7 @@ import com.mmc.iuav.user.model.vo.CompanyAuthVO;
 public interface CompanyAuthService {
     /**
      * 添加企业认证
+     *
      * @param companyAuthVO
      * @return
      */
@@ -17,6 +18,7 @@ public interface CompanyAuthService {
 
     /**
      * 根据企业名称模糊查询
+     *
      * @param searchKey
      * @return
      */
@@ -24,6 +26,7 @@ public interface CompanyAuthService {
 
     /**
      * 根据用户账号查询企业认证
+     *
      * @param userAccountId
      * @return
      */

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -79,7 +79,8 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         if (companyInfoVO != null && companyInfoVO.getCompanyType().equals(CompanyTypeEnums.FRANCHISEE.getType())) {
             // 绑定企业为加盟公司，不能生成多个账号
             int bindingCount = companyService.countCompanyBackUser(companyInfoVO.getId());
-            if (bindingCount > 0) {
+            CompanyBackUserDO companyBackDO = companyService.getCompanyBackUserByCompanyId(bUserAccountVO.getCompanyId());
+            if (bindingCount > 0 && companyBackDO != null && !companyBackDO.getBackUserAccountId().equals(bUserAccountVO.getId())) {
                 return ResultBody.error(ResultEnum.FRANCHISEE_ACCOUNT_MORE_THAN_ONE_ERROR);
             }
         }
@@ -126,7 +127,8 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         if (companyInfoVO != null && companyInfoVO.getCompanyType().equals(CompanyTypeEnums.FRANCHISEE.getType())) {
             // 绑定企业为加盟公司，不能生成多个账号
             int bindingCount = companyService.countCompanyBackUser(companyInfoVO.getId());
-            if (bindingCount > 0) {
+            CompanyBackUserDO companyBackDO = companyService.getCompanyBackUserByCompanyId(bUserAccountVO.getCompanyId());
+            if (bindingCount > 0 && companyBackDO != null && !companyBackDO.getBackUserAccountId().equals(bUserAccountVO.getId())) {
                 return ResultBody.error(ResultEnum.FRANCHISEE_ACCOUNT_MORE_THAN_ONE_ERROR);
             }
         }
@@ -163,7 +165,7 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         }
         String accountNo = "DISABLE_" + backUserAccountDO.getAccountNo() + RandomStringUtils.randomAlphanumeric(3);
         backUserAccountDao.disableBackUserAccountDO(accountId, accountNo);
-        pmsClient.removeMallGoods(accountId, null);
+        pmsClient.removeMallGoods(accountId, companyInfoVO.getId(), null);
         return ResultBody.success();
     }
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/CompanyServiceImpl.java

@@ -4,11 +4,9 @@ import com.mmc.iuav.page.PageResult;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.client.PmsClient;
+import com.mmc.iuav.user.dao.BackUserAccountDao;
 import com.mmc.iuav.user.dao.CompanyDao;
-import com.mmc.iuav.user.entity.CompanyBackUserDO;
-import com.mmc.iuav.user.entity.CompanyInfoDO;
-import com.mmc.iuav.user.entity.CompanyMemberDO;
-import com.mmc.iuav.user.entity.UserAccountDO;
+import com.mmc.iuav.user.entity.*;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
@@ -35,6 +33,9 @@ public class CompanyServiceImpl implements CompanyService {
     @Autowired
     private PmsClient pmsClient;
 
+    @Autowired
+    private BackUserAccountDao backUserAccountDao;
+
     @Override
     public ResultBody addCompanyInfo(CompanyInfoVO companyInfo) {
         int count = companyDao.countCompanyNames(companyInfo.getId(), companyInfo.getCompanyName());
@@ -82,7 +83,16 @@ public class CompanyServiceImpl implements CompanyService {
     public ResultBody<CompanyInfoVO> getCompanyInfoById(Integer id) {
         CompanyInfoDO companyInfoDO = companyDao.getCompanyInfoById(id);
         if (companyInfoDO != null) {
-            return ResultBody.success(companyInfoDO.buildCompanyInfoVO());
+            CompanyInfoVO companyInfoVO = companyInfoDO.buildCompanyInfoVO();
+            // 设置手机号
+            CompanyBackUserDO companyBackUserDO = companyDao.getCompanyBackUserByCompanyId(id);
+            if (companyBackUserDO != null) {
+                BackUserAccountDO backUserAccountDO = backUserAccountDao.getBackUserAccountDO(companyBackUserDO.getBackUserAccountId());
+                if (backUserAccountDO != null) {
+                    companyInfoVO.setPhoneNum(backUserAccountDO.getPhoneNum());
+                }
+            }
+            return ResultBody.success(companyInfoVO);
         }
         return ResultBody.success();
     }

csm-service/cms-service-user/src/main/resources/not-check.yml

@@ -21,6 +21,7 @@ data-filter:
     - /userapp/back-user/listTest
     - /userapp/company/listCompanyPageBack
     - /userapp/company/getCompanyInfoById
+    - /userapp/company/listCompanyInfoByIds
     - /userapp/cooperation/service/bitmap
     - /userapp/cooperation/listCompanyInfoByCoopId
     - /userapp/cooperation/appBrandList