提现bug修复

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/fdd/dto/AppUserFddDTO.java → cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/fdd/dto/UserFddDTO.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class AppUserFddDTO implements Serializable {
+public class UserFddDTO implements Serializable {
 
     private static final long serialVersionUID = -4952516407490131779L;
     private Integer id;

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

@@ -3,6 +3,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.dto.UserFddDTO;
 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;
@@ -63,18 +64,18 @@ public class UserFddAuthController extends BaseController {
         return userFddAuthService.findCompanyCertInfo(port, flag, this.getUserLoginInfoFromRedis(request));
     }
 
-//    @ApiOperation(value = "app获取认证信息")
-//    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppUserFddDTO.class)})
-//    @GetMapping("getAppUserFddInfo")
-//    public ResultBody<AppUserFddDTO> getAppUserFddInfo(@RequestParam String unionId) {
-//        return userFddAuthService.getAppUserFddInfo(unionId);
-//    }
-//
-//    @ApiOperation(value = "app获取认证信息(feign调用)")
-//    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = AppUserFddDTO.class)})
-//    @ApiIgnore
-//    @GetMapping("feignGetAppUserFddInfo")
-//    public List<AppUserFddDTO> feignGetAppUserFddInfo(@RequestParam List<String> unionIds) {
-//        return userFddAuthService.feignGetAppUserFddInfo(unionIds);
-//    }
+    @ApiOperation(value = "获取认证信息")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UserFddDTO.class)})
+    @GetMapping("getAppUserFddInfo")
+    public ResultBody<UserFddDTO> getAppUserFddInfo(@ApiParam(value = "端口：0小程序 1后台") @RequestParam Integer port, HttpServletRequest request) {
+        return userFddAuthService.getAppUserFddInfo(port, this.getUserLoginInfoFromRedis(request));
+    }
+
+    @ApiOperation(value = "通过uuid下载文件")
+    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
+    @GetMapping("getFileByUuid")
+    public ResultBody getFileByUuid(@RequestParam String uuid, @RequestParam(required = false) String docType) {
+        return userFddAuthService.getFileByUuid(uuid, docType);
+    }
+
 }

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

@@ -21,6 +21,7 @@ public interface UserFddAuthDao {
 
     void updateCompanyCertStatus(String customerId, String status);
 
+    UserFddDO getAppUserFddInfo(String unionId);
 
 //    void insertAppUserFdd(UserFddDO appUserFddDO1);
 //
@@ -30,7 +31,6 @@ public interface UserFddAuthDao {
 //
 //    void updateCompanyCertStatus(String customerId, String status);
 //
-//    UserFddDO getAppUserFddInfo(String unionId);
 //
 //    List<UserFddDO> feignGetAppUserFddInfo(List<String> unionIds);
 //

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

 package com.mmc.iuav.user.entity.fdd;
 
-import com.mmc.iuav.user.model.fdd.dto.AppUserFddDTO;
+import com.mmc.iuav.user.model.fdd.dto.UserFddDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -28,8 +28,8 @@ public class UserFddDO implements Serializable {
     private Date createTime;
     private Date updateTime;
 
-    public AppUserFddDTO buildAppUserFddDTO() {
-        return AppUserFddDTO.builder().id(this.id).unionId(this.unionId).customerId(this.customerId).personVerifyStatus(this.personVerifyStatus)
+    public UserFddDTO buildUserFddDTO() {
+        return UserFddDTO.builder().id(this.id).unionId(this.unionId).customerId(this.customerId).personVerifyStatus(this.personVerifyStatus)
                 .entVerifyStatus(this.entVerifyStatus).accountType(this.accountType).createTime(this.createTime).updateTime(this.updateTime).build();
     }
 

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

@@ -7,25 +7,8 @@ package com.mmc.iuav.user.service.fdd;
  */
 public interface FddService {
     String register(String uid, String accountType);
-    
-    //
-//    ResultBody findPersonCertInfo(String verifiedSerialNo);
-//
-//    ResultBody getCompanyVerifyUrl(Integer userAccountId);
-//
+
     String getApplyCert(String customerId, String transactionNo);
-//
-//    ResultBody findCompanyCertInfo(Integer userAccountId);
-//
-//    ResultBody notifyECertRes(String appId, String serialNo, String customerId, String status, String statusDesc, String certStatus, String authenticationType, String timestamp, String sign);
-//
-//    ResultBody returnECertRes(String personName, String transactionNo, String authenticationType, String status, String sign);
-//
-//    ResultBody newNotifyECertRes(Map<String, String> map);
-//
-//    ResultBody getUserFddInfo(Integer id);
-//
-//    List<UserFddDTO> feignBatchUserFddPage(List<Integer> list);
-//
+
 //    ResultBody getFileByUuid(String uuid, String docType);
 }

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

@@ -3,6 +3,7 @@ package com.mmc.iuav.user.service.fdd;
 
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
+import com.mmc.iuav.user.model.fdd.dto.UserFddDTO;
 
 import java.util.Map;
 
@@ -21,10 +22,12 @@ public interface UserFddAuthService {
     ResultBody notifyECertRes(Map<String, String> map);
 
     ResultBody findCompanyCertInfo(Integer port, Integer flag, LoginSuccessDTO loginSuccessDTO);
-//
-//    ResultBody getAppUserFddInfo(String unionId);
 
     String replaceUnableString(String uid);
-//
-//    List<AppUserFddDTO> feignGetAppUserFddInfo(List<String> unionId);
+
+    ResultBody<UserFddDTO> getAppUserFddInfo(Integer port, LoginSuccessDTO loginSuccessDTO);
+
+    ResultBody getFileByUuid(String uuid, String docType);
+
+//    List<UserFddDTO> feignGetAppUserFddInfo(List<String> unionId);
 }

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

@@ -4,10 +4,7 @@ import com.alibaba.fastjson2.JSON;
 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.fadada.sdk.verify.model.req.*;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.constant.fdd.FddConnectConstant;
@@ -230,14 +227,20 @@ public class UserFddAuthServiceImpl implements UserFddAuthService {
         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);
-//        return ResultBody.success(appUserFddDO == null ? null : appUserFddDO.buildAppUserFddDTO());
-//    }
-//
+
+    @Override
+    public ResultBody getAppUserFddInfo(Integer port, LoginSuccessDTO loginSuccessDTO) {
+        String uId;
+        if (port == 0) {
+            UserAccountDO userInfo = userServiceDao.getUserAccountById(loginSuccessDTO.getUserAccountId());
+            uId = this.replaceUnableString(userInfo.getUnionId());
+        } else {
+            uId = loginSuccessDTO.getUserAccountId().toString();
+        }
+        UserFddDO appUserFddDO = userFddAuthDao.getAppUserFddInfo(uId);
+        return ResultBody.success(appUserFddDO == null ? null : appUserFddDO.buildUserFddDTO());
+    }
+
     private CompanyVerifyResp reqCompanyVerifyUrl(String customerId) {
         FddVerifyClient client = new FddVerifyClient(FddConnectConstant.APP_ID, FddConnectConstant.APP_KEY, FddConnectConstant.VERSION, FddConnectConstant.HOST);
         CompanyVerifyUrlParams params = new CompanyVerifyUrlParams();
@@ -283,19 +286,19 @@ public class UserFddAuthServiceImpl implements UserFddAuthService {
         String u = uid.replaceAll(FddConstant.UID_REGEX, "");
         return u;
     }
-//
-//    @Override
-//    public List<AppUserFddDTO> feignGetAppUserFddInfo(List<String> unionId) {
-//        List<String> uids = new ArrayList<>();
-//        for (String uId : unionId) {
-//            String repUnionId = this.replaceUnableString(uId);
-//            uids.add(repUnionId);
-//        }
-//        List<UserFddDO> appUserFddDOs = appUserFddAuthDao.feignGetAppUserFddInfo(uids);
-//        List<AppUserFddDTO> appUserFddDTOS = new ArrayList<>();
-//        if(!CollectionUtils.isEmpty(appUserFddDOs)){
-//            appUserFddDTOS = appUserFddDOs.stream().map(UserFddDO::buildAppUserFddDTO).collect(Collectors.toList());
-//        }
-//        return appUserFddDTOS;
-//    }
+
+
+    @Override
+    public ResultBody getFileByUuid(String uuid, String docType) {
+        FddVerifyClient client = new FddVerifyClient(FddConnectConstant.APP_ID, FddConnectConstant.APP_KEY, FddConnectConstant.VERSION, FddConnectConstant.HOST);
+        FileForUUIDParams params = new FileForUUIDParams();
+        //此处传个人实名认证接口查询中返回的认证图片id，或查询企业认证信息中返回 的企业认证申请表id
+        params.setUuid(uuid);
+        //0：图片（默认图片）1：pdf (仅支持企业申请表模板)
+        params.setDocType(docType);
+        String result = client.invokeFileForUUID(params);
+        //防止被转移，把字符串转base64
+        String base64 = new String(FddEncryptTool.Base64Encode(result.getBytes())).trim();
+        return ResultBody.success(base64);
+    }
 }

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

@@ -330,6 +330,7 @@ public class XzServiceImpl implements XzService {
                     xzWithdrawalApplyDO.setOuterTradeNo(data.getOuterTradeNo());
                     xzWithdrawalApplyDO.setSubmitStatus(data.getTradeStatus());
                     xzWithdrawalApplyDO.setTradeResult(data.getTradeResult());
+                    xzWithdrawalApplyDO.setTradeStatus("await");
                     xzWithdrawalApplyDO.setTaxFundId(userSystemConstant.getTaxFundId());
                     payWalletDao.updateWithdrawalApply(xzWithdrawalApplyDO);
                 } else {

csm-service/cms-service-user/src/main/resources/mapper/fdd/UserFddAuthDao.xml

@@ -50,5 +50,10 @@
         from fdd_verify_info
         where customer_id = #{customerId}
     </select>
+    <select id="getAppUserFddInfo" resultType="com.mmc.iuav.user.entity.fdd.UserFddDO">
+        select id, customer_id, person_verify_status, ent_verify_status, account_type, create_time, update_time
+        from user_fdd
+        where union_id = #{unionId}
+    </select>
 
 </mapper>
\ No newline at end of file