Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/cms into develop

 Conflicts:
	csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/impl/XzServiceImpl.java

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/fdd/dto/FddVerifyInfoDTO.java

+package com.mmc.iuav.user.model.fdd.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author:zhenjie Date:2022/9/2
+ * time:14:34
+ */
+@NoArgsConstructor
+@AllArgsConstructor
+@Data
+@Builder
+@ApiModel(value = "com.mmc.csf.fdd.dto.AppEVerifyInfoDTO", description = "小程序用户企业认证DTO")
+public class FddVerifyInfoDTO implements Serializable {
+    private static final long serialVersionUID = 4194664180348523961L;
+    private Integer id;
+    private Integer userFddId;
+    private String customerId;
+    private String transactionNo;
+    private String url;
+    private Integer deleted;
+    private Date createTime;
+    private Date updateTime;
+}

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

@@ -2,6 +2,7 @@ package com.mmc.iuav.user.controller.fdd;
 
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.controller.BaseController;
+import com.mmc.iuav.user.model.fdd.dto.FddVerifyInfoDTO;
 import com.mmc.iuav.user.model.fdd.resp.CompanyVerifyResp;
 import com.mmc.iuav.user.model.fdd.resp.PersonVerifyResp;
 import com.mmc.iuav.user.service.fdd.UserFddAuthService;
@@ -55,12 +56,12 @@ public class UserFddAuthController extends BaseController {
         return userFddAuthService.notifyECertRes(map);
     }
 
-//    @ApiOperation(value = "app获取企业实名认证信息")
-//    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppEVerifyInfoDTO.class)})
-//    @GetMapping("findCompanyCertInfo")
-//    public ResultBody findCompanyCertInfo(@RequestParam String unionId) {
-//        return userFddAuthService.findCompanyCertInfo(unionId);
-//    }
+    @ApiOperation(value = "获取（企业/个人）实名认证信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = FddVerifyInfoDTO.class)})
+    @GetMapping("findCompanyCertInfo")
+    public ResultBody findCompanyCertInfo(@ApiParam(value = "端口：0小程序 1后台") @RequestParam Integer port, @ApiParam(value = "企业:2  个人:1") Integer flag, HttpServletRequest request) {
+        return userFddAuthService.findCompanyCertInfo(port, flag, this.getUserLoginInfoFromRedis(request));
+    }
 
 //    @ApiOperation(value = "app获取认证信息")
 //    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppUserFddDTO.class)})

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

@@ -19,8 +19,8 @@ public interface UserFddAuthService {
     ResultBody getCompanyVerifyUrl(Integer port, LoginSuccessDTO loginSuccessDTO);
 
     ResultBody notifyECertRes(Map<String, String> map);
-//
-//    ResultBody findCompanyCertInfo(String unionId);
+
+    ResultBody findCompanyCertInfo(Integer port, Integer flag, LoginSuccessDTO loginSuccessDTO);
 //
 //    ResultBody getAppUserFddInfo(String unionId);
 

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

@@ -5,6 +5,8 @@ import com.alibaba.fastjson2.JSONObject;
 import com.fadada.sdk.utils.crypt.FddEncryptTool;
 import com.fadada.sdk.verify.client.FddVerifyClient;
 import com.fadada.sdk.verify.model.req.CompanyVerifyUrlParams;
+import com.fadada.sdk.verify.model.req.FindCompanyCertParams;
+import com.fadada.sdk.verify.model.req.FindPersonCertParams;
 import com.fadada.sdk.verify.model.req.PersonVerifyUrlParams;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
@@ -190,29 +192,46 @@ public class UserFddAuthServiceImpl implements UserFddAuthService {
         return ResultBody.success();
     }
 
+
+    @Override
+    public ResultBody findCompanyCertInfo(Integer port, Integer flag, LoginSuccessDTO loginSuccessDTO) {
+        String uId;
+        String result;
+        if (port.equals(0)) {
+            UserAccountDO userInfo = userServiceDao.getUserAccountById(loginSuccessDTO.getUserAccountId());
+            uId = this.replaceUnableString(userInfo.getUnionId());
+        } else {
+            uId = loginSuccessDTO.getUserAccountId().toString();
+        }
+
+        UserFddDO appUserFddDO = userFddAuthDao.checkRegisterFdd(uId, flag);
+        if (appUserFddDO == null) {
+            return ResultBody.error(ResultEnum.REQUEST_PARAM_ILLEGAL_ERROR);
+        }
+        FddVerifyInfoDO fddVerifyInfoDO = userFddAuthDao.getVerifyUrl(appUserFddDO.getCustomerId());
+        if (fddVerifyInfoDO == null) {
+            return ResultBody.error(ResultEnum.REQUEST_PARAM_ILLEGAL_ERROR);
+        }
+        FddVerifyClient client = new FddVerifyClient(FddConnectConstant.APP_ID, FddConnectConstant.APP_KEY, FddConnectConstant.VERSION, FddConnectConstant.HOST);
+        if (flag.equals(2)) {
+            FindCompanyCertParams params = new FindCompanyCertParams();
+            //此处填获取企业实名认证地址返回的交易号
+            params.setVerifiedSerialNo(fddVerifyInfoDO.getTransactionNo());
+            result = client.invokeFindCompanyCert(params);
+        } else {
+            FindPersonCertParams params = new FindPersonCertParams();
+            //此处填获取个人实名认证地址返回的交易号
+            params.setVerifiedSerialNo(fddVerifyInfoDO.getTransactionNo());
+            result = client.invokeFindPersonCert(params);
+        }
+        if (!JSONObject.parseObject(result).getString(FddConstant.CODE).equals(FddConstant.SUCCESS)) {
+            return ResultBody.error(ResultEnum.NOT_FOUND);
+        }
+        return ResultBody.success(JSONObject.parseObject(result).getString(FddConstant.DATA));
+    }
+
     //
 //    @Override
-//    public ResultBody findCompanyCertInfo(String unionId) {
-//        String uId = this.replaceUnableString(unionId);
-//        UserFddDO appUserFddDO = appUserFddAuthDao.getAppUserFddInfo(uId);
-//        if(appUserFddDO == null){
-//            return ResultBody.error(ResultEnum.REQUEST_PARAM_ILLEGAL_ERROR);
-//        }
-//        AppEVerifyInfoDO appEVerifyInfoDO = appUserFddAuthDao.getCompanyVerifyUrl(appUserFddDO.getCustomerId());
-//        if(appEVerifyInfoDO == null){
-//            return ResultBody.error(ResultEnum.REQUEST_PARAM_ILLEGAL_ERROR);
-//        }
-//        FddVerifyClient client = new FddVerifyClient(FddConnectConstant.APP_ID, FddConnectConstant.APP_KEY, FddConnectConstant.VERSION, FddConnectConstant.HOST);
-//        FindCompanyCertParams params = new FindCompanyCertParams();
-//        params.setVerifiedSerialNo(appEVerifyInfoDO.getTransactionNo());//此处填获取企业实名认证地址返回的交易号
-//        String result = client.invokeFindCompanyCert(params);
-//        if(!JSONObject.parseObject(result).getString(FddConstant.CODE).equals(FddConstant.SUCCESS)){
-//            return ResultBody.error(ResultEnum.NOT_FOUND);
-//        }
-//        return ResultBody.success(JSONObject.parseObject(result).getString(FddConstant.DATA));
-//    }
-//
-//    @Override
 //    public ResultBody getAppUserFddInfo(String unionId) {
 //        String uId = this.replaceUnableString(unionId);
 //        UserFddDO appUserFddDO = appUserFddAuthDao.getAppUserFddInfo(uId);

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
-  newTag: fba1a7d91ae310a1c0a417813bbad72f6e9f3d68
+  newTag: 9505742b0111f2342851fa01e3fadad7dd25e39a