zhaoxian пре 6 месеци
родитељ
комит
1b9dd8fbfa

+ 5 - 1
ruixuan-live/src/main/java/com/ruixuan/isc/entity/KuaishouSupplyChain.java

@@ -310,6 +310,11 @@ public class KuaishouSupplyChain {
         if (!Check.isNull(regimentalPromotionAmount)) {
             this.setRegimentalPromotionAmount(regimentalPromotionAmount / 1000);
         }
+        if (info.getInteger("cpsOrderStatus") == 60 && !Check.isNull(regimentalPromotionAmount)) {
+            this.setTotalRegimentalSettleAmount(regimentalPromotionAmount / 1000);//待结算 预估填入
+        } else {
+            this.setTotalRegimentalSettleAmount(0L);//待结算 预估填入
+        }
         JSONArray cpsOrderProductView = info.getJSONArray("cpsOrderProductView");
         if (!Check.isNull(cpsOrderProductView)) {
             JSONObject object = cpsOrderProductView.getJSONObject(0);
@@ -344,7 +349,6 @@ public class KuaishouSupplyChain {
         this.setServiceAmount(info.getLong("serviceAmount"));
         this.setSecondServiceAmount(info.getLong("secondServiceAmount"));
         this.setPromoterCommissionRate(info.getLong("promoterCommissionRate"));
-        this.setTotalRegimentalSettleAmount(0L);//待结算 预估填入
     }
 
 }