From cfc9cd6971e4f3b47cbc78d82791dc070cfb55ed Mon Sep 17 00:00:00 2001 From: Owen <595466820@qq.com> Date: Fri, 7 Mar 2025 17:10:07 +0800 Subject: [PATCH] =?UTF-8?q?Fix:=E8=81=94=E9=80=9A=E7=94=B5=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../schedule/HaokaUpdateOrderSchedule.java | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/schedule/HaokaUpdateOrderSchedule.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/schedule/HaokaUpdateOrderSchedule.java index fb2ded9309..e05a3d6b0d 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/schedule/HaokaUpdateOrderSchedule.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/schedule/HaokaUpdateOrderSchedule.java @@ -260,29 +260,50 @@ public class HaokaUpdateOrderSchedule { logForOrder.setApiType(2); logForOrder.setParam(msgType); logForOrder.setResponse(JSON.toJSONString(msg)); + String ordersDO_None = "OrdersDO 本地不存在该订单"; try { String orderId = msg.getOrder(); OrdersDO ordersDO = ordersService.getOne(new LambdaQueryWrapperX().eq(OrdersDO::getUpstreamOrderId, orderId)); if (ordersDO == null) { logForOrder.setSuccess(false); - logForOrder.setErrorInfo("OrdersDO 本地不存在该订单"); - log.debug("OrdersDO 本地不存在该订单"); + + logForOrder.setErrorInfo(ordersDO_None); + log.debug(ordersDO_None); continue; } - /** + /** state * 订单变更类型:1:激活,2:退单(激活前),3:转套餐(要根据产品id判断是否为享有特权的套餐),4:销户(激活后),6:首充数据同步, * C1:开户完成,E0:发货,SX:未支付超期,AX:未支付用户取消,SX和AX状态目前仅支持3.27接口同步订单 */ // 物流单号 发货时必传 - String trackingNumber = msg.getTrackingNumber(); + // 上游状态 要转换为本地状态 String state = msg.getState(); - // todo XX ordersService.updateById(ordersDO); + // + if (StringUtils.isNotEmpty(state)){ + // E0:发货, + if ("E0".equals(state)){ + String trackingNumber = msg.getTrackingNumber(); + ordersDO.setTrackingNumber(trackingNumber); + ordersDO.setTrackingCompany("EMS"); + + // ordersService.updateById(ordersDO); + } + // 1:激活 + if ("1".equals(state)){ + // ordersService.updateById(ordersDO); + } + + // 退单 2 4 SX AX + if ("2,4,SX,AX".contains(state)){ + // ordersService.updateById(ordersDO); + } + } // ordersDO.setStatus(????)