zhaoxian 11 ヶ月 前
コミット
50ff58ed23

+ 5 - 8
ruixuan-live/src/main/java/com/ruixuan/isc/controller/KwaixiaodianItemGetController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -52,7 +53,7 @@ public class KwaixiaodianItemGetController extends BaseController {
      * 获取订单列表(open.order.cursor.list)
      * https://open.kwaixiaodian.com/zone/new/docs/api?name=open.order.cursor.list&version=1
      */
-/*    @GetMapping("/querykwaiOrderList")
+    @GetMapping("/querykwaiOrderList")
     @ApiOperation(value = "获kwai订单列表")
     public void querykwaiOrderList(@ApiParam("店铺ID") @RequestParam(value = "shopId", required = false) String shopId
             , @ApiParam("开始日期") @RequestParam(value = "beginDate", required = false) String beginDate
@@ -64,18 +65,15 @@ public class KwaixiaodianItemGetController extends BaseController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-    }*/
+    }
 
     /**
      * 获取订单列表(open.order.cursor.list)
      * https://open.kwaixiaodian.com/zone/new/docs/api?name=open.order.cursor.list&version=1
      */
-    @GetMapping("/querykwaiOrderList")
+    @GetMapping("/querykwaiOrderList2")
     @ApiOperation(value = "获kwai订单列表2")
-    public void querykwaiOrderList2(@ApiParam("店铺ID") @RequestParam(value = "shopId", required = false) String shopId
-            , @ApiParam("开始日期") @RequestParam(value = "beginDate", required = false) String beginDate
-            , @ApiParam("结束日期(间隔不大于7天)") @RequestParam(value = "endDate", required = false) String endDate
-    ) {
+    public void querykwaiOrderList2(@ApiParam("店铺ID") @RequestParam(value = "shopId", required = false) String shopId) {
         try {
             List<String> allDatesOfTwoTimes = DateUtils.getAllDatesOfTwoTimes("2024-10-01", "2024-10-30");
             for (String date : allDatesOfTwoTimes) {
@@ -87,5 +85,4 @@ public class KwaixiaodianItemGetController extends BaseController {
         }
     }
 
-
 }

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

@@ -9,6 +9,7 @@ import com.ruixuan.common.utils.Check;
 import com.ruixuan.common.utils.DateUtils;
 import com.ruixuan.data.utils.ExportExcelUtils;
 import com.ruixuan.isc.service.IKuaishouPromoterService;
+import com.ruixuan.isc.service.IKwaixiaodianOrderCursorListService;
 import com.ruixuan.isc.service.ISupplyChainService;
 import com.ruixuan.system.service.ISysDeptService;
 import com.ruixuan.system.service.ISysUserService;
@@ -48,6 +49,9 @@ public class SupplyChainController extends BaseController {
     private ISupplyChainService supplyChainService;
 
     @Autowired
+    private IKwaixiaodianOrderCursorListService orderCursorListService;
+
+    @Autowired
     private IKuaishouPromoterService promoterService;
 
     @Value("${accept.ruiXuanPrivateKey}")
@@ -2177,6 +2181,57 @@ public class SupplyChainController extends BaseController {
 
     }
 
+    static ExecutorService orderNewsService = Executors.newFixedThreadPool(3);
+
+    /**
+     * https://open.kwaixiaodian.com/zone/new/docs/msg?name=kwaishop_order_delivering&version=1
+     * KWaiShop订单状态消息
+     * 订单已支付消息、订单已发货消息、订单已收货消息、订单交易失败消息、订单交易成功消息 ->状态变更
+     * 新增订单 ->调取新增详情接口
+     */
+    @PostMapping(value = "/ruixuanKWaiShopOrderAccept")
+    public Map<String, Object> ruixuanKWaiShopOrderAccept(@RequestBody String eventsEncoded) {
+        Map<String, Object> result = new HashMap<>();
+        try {
+            logger.info("-KWaiShop-订单-消息-订阅-");
+            String events = PlatformEventSecurityUtil.decode(eventsEncoded, "xjX0jX828wWrnnwt26UYDA==");
+            System.out.println(events);
+//            JSONObject eventJSon = JSONObject.parseObject(events);
+//            List<String> list = new ArrayList<>();
+//            list.add("kwaishop_order_deliverySuccess");//已收货消息
+//            list.add("kwaishop_order_paySuccess");//已支付消息
+//            list.add("kwaishop_order_delivering");//已发货消息
+//            list.add("kwaishop_order_orderFail");//交易失败消息
+//            list.add("kwaishop_order_orderSuccess");//交易成功消息
+//
+//            orderNewsService.submit(new Runnable() {
+//                @Override
+//                public void run() {
+//                    try {
+//                        if (!Check.isNull(eventJSon)) {
+//                            String event = eventJSon.getString("event");
+//                            if ("kwaishop_order_addOrder".equals(event)) {
+//                                //订单新增消息
+//                                orderCursorListService.insertKWaiShopOrder(eventJSon);
+//                            } else if (list.contains(event)) {
+//                                //状态变更 kwaixiaodian_order_cursor_list
+//                                orderCursorListService.updateKWaiShopOrder(eventJSon);
+//                            }
+//                        }
+//                    } catch (Exception e) {
+//                        e.printStackTrace();
+//                    }
+//                }
+//            });
+            result.put("result", 1);
+            result.put("data", events);
+        } catch (KsMerchantApiException e) {
+            e.printStackTrace();
+        }
+        //返回成功
+        return result;
+    }
+
     @PostMapping(value = "/rocketAccept")
     public Map<String, Object> rocketAccept(@RequestBody String eventsEncoded) {
         try {

+ 8 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/IKwaixiaodianOrderCursorListService.java

@@ -1,5 +1,7 @@
 package com.ruixuan.isc.service;
 
+import com.alibaba.fastjson.JSONObject;
+
 /**
  * kwaixiaodian商品详情Service接口
  *
@@ -8,4 +10,10 @@ package com.ruixuan.isc.service;
  */
 public interface IKwaixiaodianOrderCursorListService {
     void querykwaiOrderList(String shopId, String beginDate, String endDate, String cursor);
+
+    /*新增kwaixiaodian_order_cursor_list*/
+    void insertKWaiShopOrder(JSONObject eventJSon);
+    /*修改 新增kwaixiaodian_order_cursor_list status*/
+    void updateKWaiShopOrder(JSONObject eventJSon);
+
 }

+ 34 - 0
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/KwaixiaodianOrderCursorListServiceImpl.java

@@ -104,4 +104,38 @@ public class KwaixiaodianOrderCursorListServiceImpl implements IKwaixiaodianOrde
         }
     }
 
+    @Override
+    public void insertKWaiShopOrder(JSONObject eventJSon) {
+
+    }
+
+    @Override
+    public void updateKWaiShopOrder(JSONObject eventJSon) {
+      /*  try {
+            JSONObject info = eventJSon.getJSONObject("info");
+            if (!Check.isNull(info)) {
+                Long oid = info.getLong("oid");
+                Integer cpsOrderStatus = info.getInteger("status");
+                if (cpsOrderStatus == 60) {
+                    Integer i = updateOrderRegimentalSettleAmount(oid, cpsOrderStatus);
+                    if (i > 0) {
+                        log.info("订单ID:{},状态:{} 修改成功", oid, cpsOrderStatus);
+                    } else {
+                        log.error("订单ID:{},状态:{} 修改失败", oid, cpsOrderStatus);
+                    }
+                } else {
+                    Integer i = this.updateOrderStatus(oid, cpsOrderStatus);
+                    if (i > 0) {
+                        log.info("订单ID:{},状态:{} 修改成功", oid, cpsOrderStatus);
+                    } else {
+                        log.error("订单ID:{},状态:{} 修改失败", oid, cpsOrderStatus);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+
+        }*/
+    }
+
 }