yumeng 11 ماه پیش
والد
کامیت
ad6ab24107

+ 7 - 0
ruixuan-admin/pom.xml

@@ -182,5 +182,12 @@
                 <activatedProperties>yuxiu</activatedProperties>
             </properties>
         </profile>
+        <profile>
+            <id>zhishui</id>
+            <properties>
+                <activatedProperties>zhishui</activatedProperties>
+            </properties>
+        </profile>
+
     </profiles>
 </project>

+ 1 - 1
ruixuan-admin/src/main/resources/application-dev.yml

@@ -225,7 +225,7 @@ express:
 
 accept:
   ruiXuanPrivateKey: JRowMMndTkSlvVORNvtJbw==
-  mgsPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
+  zhiShuiPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
   rocketPrivateKey: xKFElGEYMjCwEl49uS7+cQ==
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==

+ 1 - 1
ruixuan-admin/src/main/resources/application-mgs.yml

@@ -211,7 +211,7 @@ express:
 
 accept:
   ruiXuanPrivateKey: JRowMMndTkSlvVORNvtJbw==
-  mgsPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
+  zhiShuiPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
   rocketPrivateKey: xKFElGEYMjCwEl49uS7+cQ==
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==

+ 1 - 1
ruixuan-admin/src/main/resources/application-prod.yml

@@ -211,7 +211,7 @@ express:
 
 accept:
   ruiXuanPrivateKey: JRowMMndTkSlvVORNvtJbw==
-  mgsPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
+  zhiShuiPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
   rocketPrivateKey: xKFElGEYMjCwEl49uS7+cQ==
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==

+ 1 - 1
ruixuan-admin/src/main/resources/application-rocket.yml

@@ -211,7 +211,7 @@ express:
 
 accept:
   ruiXuanPrivateKey: JRowMMndTkSlvVORNvtJbw==
-  mgsPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
+  zhiShuiPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
   rocketPrivateKey: xKFElGEYMjCwEl49uS7+cQ==
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==

+ 1 - 1
ruixuan-admin/src/main/resources/application-yufu.yml

@@ -211,7 +211,7 @@ express:
 
 accept:
   ruiXuanPrivateKey: JRowMMndTkSlvVORNvtJbw==
-  mgsPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
+  zhiShuiPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
   rocketPrivateKey: xKFElGEYMjCwEl49uS7+cQ==
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==

+ 1 - 1
ruixuan-admin/src/main/resources/application-yuxiu.yml

@@ -211,7 +211,7 @@ express:
 
 accept:
   ruiXuanPrivateKey: JRowMMndTkSlvVORNvtJbw==
-  mgsPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
+  zhiShuiPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
   rocketPrivateKey: xKFElGEYMjCwEl49uS7+cQ==
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
   mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 223 - 0
ruixuan-admin/src/main/resources/application-zhishui.yml


+ 5 - 3
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -53,8 +53,8 @@ public class SupplyChainController extends BaseController {
     @Value("${accept.ruiXuanPrivateKey}")
     private String ruiXuanPrivateKey;
 
-    @Value("${accept.mgsPrivateKey}")
-    private String mgsPrivateKey;
+    @Value("${accept.zhiShuiPrivateKey}")
+    private String zhiShuiPrivateKey;
 
     @Value("${accept.rocketPrivateKey}")
     private String rocketPrivateKey;
@@ -2179,11 +2179,13 @@ public class SupplyChainController extends BaseController {
     }
 
 
+
+    // 止水
     @PostMapping(value = "/mgsAccept")
     public Map<String, Object> mgsAccept(@RequestBody String eventsEncoded) {
         try {
             logger.info("止水优选消息订阅");
-            String events = PlatformEventSecurityUtil.decode(eventsEncoded, mgsPrivateKey);
+            String events = PlatformEventSecurityUtil.decode(eventsEncoded, zhiShuiPrivateKey);
             JSONObject eventJSon = JSONObject.parseObject(events);
             fxNowService.submit(new Runnable() {
                 @Override

+ 4 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/mapper/SupplyChainMapper.java

@@ -258,4 +258,8 @@ public interface SupplyChainMapper {
     int updateYuXiuOrder(@Param("oid") Long oid, @Param("cpsOrderStatus") Integer cpsOrderStatus);
 
     int updateYuXiuOrderRegimentalSettleAmount(@Param("oid") Long oid, @Param("cpsOrderStatus") Integer cpsOrderStatus);
+
+    int updatezhishuiOrderRegimentalSettleAmount(Long oid, @Param("cpsOrderStatus") Integer cpsOrderStatus);
+
+    int updateZhishuiOrder(@Param("oid") Long oid, @Param("cpsOrderStatus") Integer cpsOrderStatus);
 }

+ 79 - 2
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/SupplyChainServiceImpl.java

@@ -550,6 +550,35 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
                 return yufu;
             }
         }
+
+        if ("zhishui".equals(ownershipId)) {
+            int zhishui = supplyChainMapper.updateZhishuiOrder(oid, cpsOrderStatus);
+            if (zhishui > 0) {
+                return zhishui;
+            }
+            int ruixuan = supplyChainMapper.updateRuixuanOrder(oid, cpsOrderStatus);
+            if (ruixuan > 0) {
+                return ruixuan;
+            }
+            int mgs = supplyChainMapper.updateMgsOrder(oid, cpsOrderStatus);
+            if (mgs > 0) {
+                return mgs;
+            }
+            int rocket = supplyChainMapper.updateRocketOrder(oid, cpsOrderStatus);
+            if (rocket > 0) {
+                return rocket;
+            }
+            int yufu = supplyChainMapper.updateYufuOrder(oid, cpsOrderStatus);
+            if (yufu > 0) {
+                return yufu;
+            }
+            int yuxiu = supplyChainMapper.updateYuXiuOrder(oid, cpsOrderStatus);
+            if (yuxiu > 0) {
+                return yuxiu;
+            }
+        }
+
+
         return 0;
     }
 
@@ -576,7 +605,10 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             if (yuxiu > 0) {
                 return yuxiu;
             }
-
+            int zhishui = supplyChainMapper.updatezhishuiOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (zhishui > 0) {
+                return zhishui;
+            }
         }
 
         if ("miaogousi".equals(ownershipId)) {
@@ -600,6 +632,10 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             if (yuxiu > 0) {
                 return yuxiu;
             }
+            int zhishui = supplyChainMapper.updatezhishuiOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (zhishui > 0) {
+                return zhishui;
+            }
 
         }
         if ("rocket".equals(ownershipId)) {
@@ -623,6 +659,10 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             if (yuxiu > 0) {
                 return yuxiu;
             }
+            int zhishui = supplyChainMapper.updatezhishuiOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (zhishui > 0) {
+                return zhishui;
+            }
 
         }
 
@@ -646,11 +686,15 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
                 return rocket;
             }
 
-
             int yuxiu = supplyChainMapper.updateYuxiuOrderRegimentalSettleAmount(oid, cpsOrderStatus);
             if (yuxiu > 0) {
                 return yuxiu;
             }
+
+            int zhishui = supplyChainMapper.updatezhishuiOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (zhishui > 0) {
+                return zhishui;
+            }
         }
         if ("yuxiu".equals(ownershipId)) {
             int yuxiu = supplyChainMapper.updateYuxiuOrderRegimentalSettleAmount(oid, cpsOrderStatus);
@@ -673,8 +717,41 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
             if (yufu > 0) {
                 return yufu;
             }
+            int zhishui = supplyChainMapper.updatezhishuiOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (zhishui > 0) {
+                return zhishui;
+            }
+
         }
 
+        if ("zhishui".equals(ownershipId)) {
+            int zhishui = supplyChainMapper.updatezhishuiOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (zhishui > 0) {
+                return zhishui;
+            }
+            int ruixuan = supplyChainMapper.updateRuiXuanOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (ruixuan > 0) {
+                return ruixuan;
+            }
+            int mgs = supplyChainMapper.updateMgsOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (mgs > 0) {
+                return mgs;
+            }
+            int rocket = supplyChainMapper.updateRocketOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (rocket > 0) {
+                return rocket;
+            }
+            int yufu = supplyChainMapper.updateYufuOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (yufu > 0) {
+                return yufu;
+            }
+            int yuxiu = supplyChainMapper.updateYuxiuOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+            if (yuxiu > 0) {
+                return yuxiu;
+            }
+        }
+
+
         return 0;
     }
 

+ 11 - 0
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -3994,5 +3994,16 @@
             store_score          = #{storeScore}
         where item_id = #{itemId}
     </update>
+    <update id="updatezhishuiOrderRegimentalSettleAmount">
+        UPDATE zhishui.kuaishou_supply_chain
+        SET order_status                   = #{cpsOrderStatus},
+            total_regimental_settle_amount = regimental_promotion_amount
+        WHERE oid = #{oid}
+    </update>
+    <update id="updateZhishuiOrder">
+        UPDATE zhishui.kuaishou_supply_chain
+        SET order_status = #{cpsOrderStatus}
+        WHERE oid = #{oid}
+    </update>
 
 </mapper>