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

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/fdd/vo/ContractVO.java

 package com.mmc.iuav.user.model.fdd.vo;
 
+import com.mmc.iuav.group.Insert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -18,19 +19,19 @@ import java.io.Serializable;
 @AllArgsConstructor
 public class ContractVO implements Serializable {
     private static final long serialVersionUID = 570570471824495498L;
-    @ApiModelProperty(value = "合同地址")
-    @NotNull(message = "合同地址不能为空")
+    @ApiModelProperty(value = "合同地址", required = true)
+    @NotNull(message = "合同地址不能为空", groups = {Insert.class})
     private String docUrl;
 
-    @ApiModelProperty(value = "订单编号")
-    @NotNull(message = "订单编号不能为空")
+    @ApiModelProperty(value = "订单编号", required = true)
+    @NotNull(message = "订单编号不能为空", groups = {Insert.class})
     private String orderNo;
 
-    @ApiModelProperty(value = "合同标题")
-    @NotNull(message = "合同标题不能为空")
+    @ApiModelProperty(value = "合同标题", required = true)
+    @NotNull(message = "合同标题不能为空", groups = {Insert.class})
     private String title;
 
-    @ApiModelProperty(value = "端口：0小程序 1后台")
+    @ApiModelProperty(value = "端口：0小程序 1后台", required = true)
     private Integer port;
 
     @ApiModelProperty(value = "unionId", hidden = true)

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/wallet/PayUavWalletVO.java

@@ -29,7 +29,7 @@ public class PayUavWalletVO implements Serializable {
     @ApiModelProperty(value = "佣金")
     private BigDecimal salaryAmount;
 
-    @ApiModelProperty(value = "订单状态 100：订单支付  1400:商城订单退款 1500:订单提成", required = true)
+    @ApiModelProperty(value = "订单状态 100：订单支付  1400:商城订单退款 1500:订单提成 999:确认收货", required = true)
     private Integer orderStatus;
 
     @ApiModelProperty(value = "订单备注")

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

@@ -28,7 +28,7 @@ public class FddConstant {
     //小程序企业实名认证异步回调
     public static final String NOTIFY_E_CERT_RES = "fdd/auth/notifyECertRes";
     //签署合同异步回调
-    public static final String NOTIFY_STAMP = "/fdd/contract/notifyStamp";
+    public static final String NOTIFY_STAMP = "fdd/contract/notifyStamp";
 
     public static final String APP_ID = "appId";
 

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

 package com.mmc.iuav.user.controller.fdd;
 
+import com.mmc.iuav.group.Insert;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.controller.BaseController;
 import com.mmc.iuav.user.model.fdd.dto.ContractInfoDTO;
@@ -7,6 +8,7 @@ import com.mmc.iuav.user.model.fdd.vo.ContractVO;
 import com.mmc.iuav.user.service.fdd.ContractService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -29,7 +31,7 @@ public class ContractController extends BaseController {
     @ApiOperation(value = "上传合同")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("/uploadContract")
-    public ResultBody uploadContract(@RequestBody ContractVO param, HttpServletRequest request) {
+    public ResultBody uploadContract(@Validated(value = {Insert.class}) @RequestBody ContractVO param, HttpServletRequest request) {
         return contractService.uploadContract(param, this.getUserLoginInfoFromRedis(request));
     }
 

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

@@ -53,6 +53,9 @@ public class ContractServiceImpl implements ContractService {
     @Override
     public ResultBody uploadContract(ContractVO param, LoginSuccessDTO loginSuccessDTO) {
         ResultBody resultBody = sealManageService.checkAuthStatus(param.getPort(), loginSuccessDTO);
+        if (!resultBody.getCode().equals("200")) {
+            return resultBody;
+        }
         UserFddDO userFddDO = (UserFddDO) resultBody.getResult();
         FddBaseClient baseClient = new FddBaseClient(FddConnectConstant.APP_ID, FddConnectConstant.APP_KEY, FddConnectConstant.VERSION, FddConnectConstant.HOST);
         // 查询这个订单号之前有没有上传过合同有的话就删除
@@ -119,6 +122,9 @@ public class ContractServiceImpl implements ContractService {
     @Override
     public ResultBody stamp(String contractId, LoginSuccessDTO loginSuccessDTO, String pages, Integer port) {
         ResultBody resultBody = sealManageService.checkAuthStatus(port, loginSuccessDTO);
+        if (!resultBody.getCode().equals("200")) {
+            return resultBody;
+        }
         UserFddDO userFddDO = (UserFddDO) resultBody.getResult();
         // 获取合同信息
         ContractInfoDO contractInfo = contractDao.contractInfoByOrderNo(null, contractId);
@@ -207,7 +213,10 @@ public class ContractServiceImpl implements ContractService {
 
     @Override
     public ResultBody file(String contractId, LoginSuccessDTO loginSuccessDTO, Integer port) {
-        sealManageService.checkAuthStatus(port, loginSuccessDTO);
+        ResultBody resultBody = sealManageService.checkAuthStatus(port, loginSuccessDTO);
+        if (!resultBody.getCode().equals("200")) {
+            return resultBody;
+        }
         // 判断该合同状态是否可以归档
         ContractInfoDO contractInfoDO = contractDao.contractInfoByOrderNo(null, contractId);
         if (!contractInfoDO.getSignStatus().equals(4)) {

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

@@ -53,6 +53,9 @@ public class SealManageServiceImpl implements SealManageService {
     @Override
     public ResultBody uploadSeal(SealVO sealVO, LoginSuccessDTO loginSuccessDTO) {
         ResultBody resultBody = this.checkAuthStatus(sealVO.getPort(), loginSuccessDTO);
+        if (!resultBody.getCode().equals("200")) {
+            return resultBody;
+        }
         UserFddDO userFddInfo = (UserFddDO) resultBody.getResult();
         sealVO.setUnionId(userFddInfo.getUnionId());
         FddBaseClient baseClient = new FddBaseClient(FddConnectConstant.APP_ID, FddConnectConstant.APP_KEY, FddConnectConstant.VERSION, FddConnectConstant.HOST);
@@ -119,6 +122,9 @@ public class SealManageServiceImpl implements SealManageService {
     @Override
     public ResultBody removeSeal(String signatureId, Integer port, LoginSuccessDTO loginSuccessDTO) {
         ResultBody resultBody = checkAuthStatus(port, loginSuccessDTO);
+        if (!resultBody.getCode().equals("200")) {
+            return resultBody;
+        }
         UserFddDO userFddInfo = (UserFddDO) resultBody.getResult();
         // 调用法大大删除印章接口
         FddExtraClient client = new FddExtraClient(FddConnectConstant.APP_ID, FddConnectConstant.APP_KEY, FddConnectConstant.VERSION, FddConnectConstant.HOST);
@@ -140,7 +146,24 @@ public class SealManageServiceImpl implements SealManageService {
         String uid;
         if (port.equals(0)) {
             UserAccountDO userInfo = userServiceDao.getUserAccountById(loginSuccessDTO.getUserAccountId());
-            uid = userFddAuthService.replaceUnableString(userInfo.getUnionId());
+            String unionId = userInfo.getUnionId();
+            uid = userFddAuthService.replaceUnableString(unionId);
+
+            UserFddDO userFddInfo = userFddAuthDao.getAppUserFddInfo(uid);
+            if (userFddInfo == null) {
+                uid = userFddAuthService.replaceUnableString(userInfo.getOpenId());
+            } else {
+                Integer accountType = userFddInfo.getAccountType();
+                Integer personVerifyStatus = userFddInfo.getPersonVerifyStatus();
+                Integer entVerifyStatus = userFddInfo.getEntVerifyStatus();
+
+                boolean isPersonVerified = !accountType.equals(1) && personVerifyStatus.equals(2);
+                boolean isEntVerified = !accountType.equals(2) && entVerifyStatus.equals(4);
+
+                if (isPersonVerified || isEntVerified) {
+                    uid = userFddAuthService.replaceUnableString(userInfo.getOpenId());
+                }
+            }
         } else {
             uid = loginSuccessDTO.getUserAccountId().toString();
         }
@@ -161,6 +184,9 @@ public class SealManageServiceImpl implements SealManageService {
     @Transactional(rollbackFor = Exception.class)
     public ResultBody defaultSeal(String signatureId, Integer port, LoginSuccessDTO loginSuccessDTO) {
         ResultBody resultBody = checkAuthStatus(port, loginSuccessDTO);
+        if (!resultBody.getCode().equals("200")) {
+            return resultBody;
+        }
         UserFddDO userFddInfo = (UserFddDO) resultBody.getResult();
         FddExtraClient client = new FddExtraClient(FddConnectConstant.APP_ID, FddConnectConstant.APP_KEY, FddConnectConstant.VERSION, FddConnectConstant.HOST);
         DefaultSignatureParams params = new DefaultSignatureParams();
@@ -181,6 +207,9 @@ public class SealManageServiceImpl implements SealManageService {
     @Override
     public ResultBody getSealInfo(String signatureId, Integer port, LoginSuccessDTO loginSuccessDTO) {
         ResultBody resultBody = checkAuthStatus(port, loginSuccessDTO);
+        if (!resultBody.getCode().equals("200")) {
+            return resultBody;
+        }
         UserFddDO userFddInfo = (UserFddDO) resultBody.getResult();
         FddExtraClient client = new FddExtraClient(FddConnectConstant.APP_ID, FddConnectConstant.APP_KEY, FddConnectConstant.VERSION, FddConnectConstant.HOST);
         QuerySignatureParams params = new QuerySignatureParams();

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

@@ -49,8 +49,14 @@ public class UserFddAuthServiceImpl implements UserFddAuthService {
 
     @Override
     public ResultBody getPersonVerifyUrl(Integer userAccountId) {
+        String unionId;
         UserAccountDO userInfo = userServiceDao.getUserAccountById(userAccountId);
-        String unionId = this.replaceUnableString(userInfo.getUnionId());
+        unionId = this.replaceUnableString(userInfo.getUnionId());
+        // 判断是否使用unionId注册过企业认证，如果注册过那就用openid注册
+        String companyCustomerId = this.checkRegisterFdd(unionId, 2);
+        if (companyCustomerId != null) {
+            unionId = this.replaceUnableString(userInfo.getOpenId());
+        }
         //验证是否注册个人
         String customerId = this.checkRegisterFdd(unionId, 1);
         if (customerId == null) {
@@ -119,7 +125,14 @@ public class UserFddAuthServiceImpl implements UserFddAuthService {
         if (port.equals(0)) {
             // 获取小程序用户信息拿到unionId
             UserAccountDO userInfo = userServiceDao.getUserAccountById(loginSuccessDTO.getUserAccountId());
-            uId = this.replaceUnableString(userInfo.getUnionId());
+            String unionId = this.replaceUnableString(userInfo.getUnionId());
+            // 判断是否用uid注册个人认证，如果用了那么就用openid进行企业认证
+            String customerId = this.checkRegisterFdd(unionId, 1);
+            if (customerId == null) {
+                uId = unionId;
+            } else {
+                uId = this.replaceUnableString(userInfo.getOpenId());
+            }
         } else {
             uId = loginSuccessDTO.getUserAccountId().toString();
         }

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

@@ -633,12 +633,16 @@ public class PayWalletServiceImpl implements PayWalletService {
             payWalletDO.setCashFreeze(userWalletInfo.getCashAmt().subtract(payUavWalletVO.getCashAmount()));
             payWalletDO.setSalaryAmt(userWalletInfo.getSalaryAmt().add(payUavWalletVO.getSalaryAmount()));
             payWalletDO.setSalaryFreeze(userWalletInfo.getSalaryAmt().subtract(payUavWalletVO.getSalaryAmount()));
-        } else {
+        } else if (payUavWalletVO.getOrderStatus().equals(PayMethodEnums.ORDER_INCOME.getCode())) {
             payLogDO.setPayMethod(payUavWalletVO.getOrderStatus());
             payLogDO.setCashAmtPaid(BigDecimal.ZERO);
             payLogDO.setSalaryAmtPaid(payUavWalletVO.getSalaryAmount());
             // 订单收益
             payWalletDO.setSalaryAmt(userWalletInfo.getSalaryAmt().add(payUavWalletVO.getSalaryAmount()));
+        } else {
+            // 确认收货，解冻用户钱包信息
+            payWalletDO.setSalaryFreeze(userWalletInfo.getSalaryFreeze().subtract(payUavWalletVO.getSalaryAmount()));
+            payWalletDO.setCashFreeze(userWalletInfo.getCashFreeze().subtract(payUavWalletVO.getCashAmount()));
         }
         payWalletDao.insertPayLogDO(payLogDO);
         payWalletDao.updatePayWallet(payWalletDO);

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: 27473b46f0160e61cc5ebb44503accdc785828f7
+  newTag: 28b0bd5096fa757ff3a8d51c2be7fc2380a22f1a