Browse Source

rx食品2团

yumeng 1 năm trước cách đây
mục cha
commit
5b4177d6a9

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

@@ -228,6 +228,7 @@ accept:
   mgsPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
   rocketPrivateKey: xKFElGEYMjCwEl49uS7+cQ==
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
+  mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
 
 ownership:
   id: ruixuan

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

@@ -214,6 +214,7 @@ accept:
   mgsPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
   rocketPrivateKey: xKFElGEYMjCwEl49uS7+cQ==
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
+  mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
 
 ownership:
   id: miaogousi

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

@@ -214,6 +214,7 @@ accept:
   mgsPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
   rocketPrivateKey: xKFElGEYMjCwEl49uS7+cQ==
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
+  mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
 
 ownership:
   id: ruixuan

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

@@ -214,6 +214,7 @@ accept:
   mgsPrivateKey: Lj8XC4h9m639SjDsptx9Dg==
   rocketPrivateKey: xKFElGEYMjCwEl49uS7+cQ==
   dfcPrivateKey: 3LZwHFNXlMJ1mtaeQbTajQ==
+  mgsPrivateKey2: XFbcIZTeGgDZ/A8kuLhWTw==
 
 ownership:
   id: rocket

+ 37 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/controller/SupplyChainController.java

@@ -59,6 +59,8 @@ public class SupplyChainController extends BaseController {
 
     @Value("${accept.dfcPrivateKey}")
     private String dfcPrivateKey;
+    @Value("${accept.mgsPrivateKey2}")
+    private String mgsPrivateKey2;
 
     @GetMapping("/privateKey")
     @ApiOperation(value = "达人订单")
@@ -2191,6 +2193,41 @@ public class SupplyChainController extends BaseController {
     }
 
 
+
+    @PostMapping(value = "/mgsAccept2")
+    public Map<String, Object> mgsAccept2(@RequestBody String eventsEncoded) {
+        try {
+            logger.error("RX食品-二团严选消息订阅");
+            String events = PlatformEventSecurityUtil.decode(eventsEncoded, mgsPrivateKey2);
+            JSONObject eventJSon = JSONObject.parseObject(events);
+            fxNowService.submit(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        if (!Check.isNull(eventJSon)) {
+                            String event = eventJSon.getString("event");
+                            if ("kwaishop_distribute_order_change_notify".equals(event)) {
+                                supplyChainService.updateOrder(eventJSon);
+                            } else if ("kwaishop_distribute_activity_item_change".equals(event)) {
+                                supplyChainService.updateItem(eventJSon);
+                            }
+                        }
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        } catch (KsMerchantApiException e) {
+            e.printStackTrace();
+        }
+        //返回成功
+        Map<String, Object> result = new HashMap<>();
+        result.put("result", 1);
+        return result;
+
+    }
+
+
     @GetMapping("/addListKuaishouActivityInfo")
     @ApiOperation(value = "团长查询招商活动列表")
     public void addListKuaishouActivityInfo() {