‘linchangsheng’ 3 mēneši atpakaļ
vecāks
revīzija
2adabfda93

+ 13 - 6
mall-server-api/src/main/java/com/gree/mall/manager/logic/policy/AgreementLogic.java

@@ -1421,6 +1421,11 @@ public class AgreementLogic {
 
         for (WorkerPolicy workerPolicy : workerPolicies) {
 
+            AdminWebsit adminWebsit = adminWebsitService.getById(workerPolicy.getWebsitId());
+            if (!adminWebsit.getAttr().equals("SELF"))
+                continue;
+
+
             if (policyOrderService.lambdaQuery().eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderInStutasEnum.DGM.getKey())
                     .eq(PolicyOrder::getWebsitUserId,workerPolicy.getWebsitUserId())
                     .eq(PolicyOrder::getType,"IN").count() > 0) {
@@ -1485,6 +1490,14 @@ public class AgreementLogic {
 
         for (WorkerPolicy workerPolicy : workerPolicies) {
 
+            AdminWebsit adminWebsit = adminWebsitService.getById(workerPolicy.getWebsitId());
+
+            if (adminWebsit == null)
+                continue;
+
+            if (!adminWebsit.getAttr().equals("SELF"))
+                continue;
+
             if (policyOrderService.lambdaQuery().eq(PolicyOrder::getPolicyOrderStatus, PolicyOrderEmStutasEnum.XG.getKey())
                     .eq(PolicyOrder::getWebsitUserId,workerPolicy.getWebsitUserId())
                     .eq(PolicyOrder::getType,"EM").count() > 0) {
@@ -1503,12 +1516,6 @@ public class AgreementLogic {
                 continue;
             }
 
-
-            AdminWebsit adminWebsit = adminWebsitService.getById(workerPolicy.getWebsitId());
-
-            if (adminWebsit == null)
-                continue;
-
             WebsitUser websitUser = websitUserService.getById(workerPolicy.getWebsitUserId());
             User user = userService.getById(websitUser.getUserId());