|
@@ -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 {
|