FengChaoYu il y a 3 mois
Parent
commit
a2f22660ac

+ 6 - 0
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/user/UserWxBean.java

@@ -49,4 +49,10 @@ public class UserWxBean extends User {
 
     @ApiModelProperty("是否显示租赁")
     private Boolean isShowLease = false;
+
+    @ApiModelProperty("是否广州签确认书")
+    private Boolean isGZSign = false;
+
+    @ApiModelProperty("是否佛山签确认书")
+    private Boolean isFSSign = false;
 }

+ 4 - 2
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -1032,10 +1032,12 @@ public class UserLogic {
                             .collect(Collectors.toList());
                     for (String code : companyCodeList) {
                         if (code.equals(Constant.gree.GUANGZHOUXIAOSI) && StringUtils.isBlank(user.getWorkerSignGz())) {
-                            throw new RemoteServiceException(ResponseHelper.ResponseCode_NOT_SIGN_G_PAY_CONFIRM, "未广州签支付确认书");
+//                            throw new RemoteServiceException(ResponseHelper.ResponseCode_NOT_SIGN_G_PAY_CONFIRM, "广州未签支付确认书");
+                            userWxBean.setIsGZSign(true);
                         }
                         if (code.equals(Constant.gree.FOSHANXIAOSI) && StringUtils.isBlank(user.getWorkerSignFs())) {
-                            throw new RemoteServiceException(ResponseHelper.ResponseCode_NOT_SIGN_F_PAY_CONFIRM, "未佛山签支付确认书");
+//                            throw new RemoteServiceException(ResponseHelper.ResponseCode_NOT_SIGN_F_PAY_CONFIRM, "佛山未签支付确认书");
+                            userWxBean.setIsFSSign(true);
                         }
                     }
                 }