no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/constant/Constant.java

@@ -16,6 +16,10 @@ public class Constant {
         public final static String ACCESS_KEY_SECERT = "E5LW0V1H8HBxqjKkExIxaXUgSyex6C";
     }
 
+    public class gree {
+        public final static String GUANGZHOUXIAOSI = "S9219801";
+        public final static String FOSHANXIAOSI = "S9219807";
+    }
 
     public class Img{
         //订单售后 退款凭证

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

@@ -1019,20 +1019,24 @@ public class UserLogic {
 
             if (CollectionUtil.isNotEmpty(websitUsers)) {
                 final List<String> websitIds = websitUsers.stream().map(WebsitUser::getWebsitId).distinct().collect(Collectors.toList());
-                final List<String> companyCodeList = adminWebsitService.lambdaQuery()
+                final List<AdminWebsit> adminWebsitList = adminWebsitService.lambdaQuery()
                         .select(AdminWebsit::getBelongCompanyCode)
                         .in(AdminWebsit::getWebsitId, websitIds)
+                        .eq(AdminWebsit::getAttr, WebsitAttrEnum.SELF.getKey())
                         .groupBy(AdminWebsit::getBelongCompanyCode)
-                        .list()
-                        .stream()
-                        .map(AdminWebsit::getBelongCompanyCode)
-                        .collect(Collectors.toList());
-                for (String code : companyCodeList) {
-                    if (code.equals("S9219801") && StringUtils.isBlank(user.getWorkerSignGz())) {
-                        throw new RemoteServiceException(ResponseHelper.ResponseCode_NOT_SIGN_G_PAY_CONFIRM, "未广州签支付确认书");
-                    }
-                    if (code.equals("S9219807") && StringUtils.isBlank(user.getWorkerSignFs())) {
-                        throw new RemoteServiceException(ResponseHelper.ResponseCode_NOT_SIGN_F_PAY_CONFIRM, "未佛山签支付确认书");
+                        .list();
+                if (CollectionUtil.isNotEmpty(adminWebsitList)) {
+                    final List<String> companyCodeList = adminWebsitList
+                            .stream()
+                            .map(AdminWebsit::getBelongCompanyCode)
+                            .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, "未广州签支付确认书");
+                        }
+                        if (code.equals(Constant.gree.FOSHANXIAOSI) && StringUtils.isBlank(user.getWorkerSignFs())) {
+                            throw new RemoteServiceException(ResponseHelper.ResponseCode_NOT_SIGN_F_PAY_CONFIRM, "未佛山签支付确认书");
+                        }
                     }
                 }
             }