refactor(external): 将消息处理器从控制器包移动到处理器包

- 移动 AccountActiveMessageHandler 到 handler.impl 包
- 移动 AfterSaleApplyMessageHandler 到 handler.impl 包
- 移动 AfterSaleCancelMessageHandler 到 handler.impl 包
- 移动 AfterSaleDeliverMessageHandler 到 handler.impl 包
- 移动 AfterSaleReceiveConfirmMessageHandler 到 handler.impl 包
- 移动 AfterSaleRefundNoticeMessageHandler 到 handler.impl 包
- 移动 BillAbnormalPassMessageHandler 到 handler.impl 包
- 移动 BillConfirmMessageHandler 到 handler.impl 包
- 移动 BillCreateMessageHandler 到 handler.impl 包
- 移动 BillFinishMessageHandler 到 handler.impl 包
- 移动 BillModifyMessageHandler 到 handler.impl 包
- 移动 BillRejctPassMessageHandler 到 handler.impl 包
- 移动 BillRuleCreateMessageHandler 到 handler.impl 包
- 移动 BillWaitInvoiceMessageHandler 到 handler.impl 包
- 移动 GoodsAuditPassMessageHandler 到 handler.impl 包
- 移动 GoodsAuditRejectMessageHandler 到 handler.impl 包
- 移动 GoodsImportBlockMessageHandler 到 handler.impl 包
- 移动 GoodsOffShelfMessageHandler 到 handler.impl 包
- 移动 GoodsOnShelfFailMessageHandler 到 handler.impl 包
- 移动 GoodsWaitAuditMessageHandler 到 handler.impl 包
- 移动 InvoiceApplyMessageHandler 到 handler.impl 包
- 移动 MallMessageDispatcher 到 handler 包
- 移动 MallMessageHandler 到 handler 包
- 移动 OrderCancelApplyMessageHandler 到 handler.impl 包
- 移动 OrderCancelMessageHandler 到 handler.impl 包
- 移动 OrderCreateMessageHandler 到 handler.impl 包
- 移动 OrderPayNoticeMessageHandler 到 handler.impl 包
- 移动 OrderPreConfirmMessageHandler 到 handler.impl 包
- 移动 OrderReceiveConfirmMessageHandler 到 handler.impl 包
- 移动 PrepareCancelMessageHandler 到 handler.impl 包
- 移动 PrepareConfirmMessageHandler 到 handler.impl 包
- 移动 PrepareCreateMessageHandler 到 handler.impl 包
- 更新所有相关导入路径以匹配新的包结构

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/tongji/TongJiPullController.java

@@ -54,6 +54,7 @@ public class TongJiPullController {
     private static final String CLIENT_ID = "KFZOW9K7ix6";
     private static final String PRIVATE_KEY = "MIGTAgEAMBMGByqGSM49AgEGCCqBHM9VAYItBHkwdwIBAQQgkRuHZ2UkqHOv+TpwYFkccmIJpE4Tje63UFV++O1AxTKgCgYIKoEcz1UBgi2hRANCAASL+QeNJvix0bhOunIyO/s1as0aGkQ6am3rf/4eb17UOnJzVo6xvKOFPRA/5rG0rFggU5hYwe70ElN/xWT/Cy2g"; // 电商平台私钥
     private static final String TJ_PUBLIC_KEY = "MFkwEwYHKoZIzj0CAQYIKoEcz1UBgi0DQgAECeORp+9YlmSobsiULe0D1obWOxjTG4aAeufqhtXEwy9BhpbLKQjjifXHKcb92ozx0VBtt5Yt9E7U06+hc0x/tQ=="; // 同济公钥
+    private final String username = "yoe365-tiyy";
     //测试环境
     // 同济地区查询接口地址（替换为真实域名）
 //    private static final String AREA_QUERY_URL = "https://supply-test.crrcgo.cc/mallapi/";
@@ -74,6 +75,7 @@ public class TongJiPullController {
         // 1. 校验业务请求参数（自身先校验，避免无效调用电商平台）
         //1 省级，2市级，3县级， 4区级
         //父级地址id	当查询省级时填0
+        log.info("同济地区查询 - 参数：{}", bo);
         if (bo.getLevel() == null || !List.of(1, 2, 3, 4).contains(bo.getLevel())) {
             throw new RuntimeException("级次（level）必填，且仅支持1/2/3/4");
         }
@@ -459,7 +461,9 @@ public class TongJiPullController {
     @PostMapping("/mall/order/detail")
     public OrderDetailVo mallOrderDetail(@RequestBody OrderDetailBo bo) {
         ZCR responseDto = doZcPost("/api/mall/order/detail", bo);
+        log.info("查询订单详情参数:{}",JSONUtil.toJsonStr(bo));
         OrderDetailVo orderDetailVo = parseZcResponse(responseDto, OrderDetailVo.class);
+        log.info("查询订单详情结果：{}", orderDetailVo);
         return orderDetailVo;
     }
 
@@ -467,7 +471,9 @@ public class TongJiPullController {
     @PostMapping("/mall/order/confirm")
     public GoodsUpdateVo mallOrderConfirm(@RequestBody OrderConfirmBo bo) throws ZhongcheException {
         ZCR responseDto = doZcPost("/api/mall/order/confirm", bo);
+        log.info("接单参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("接单结果：{}", zcr);
         return zcr;
     }
 
@@ -475,7 +481,9 @@ public class TongJiPullController {
     @PostMapping("/mall/order/goods/append")
     public GoodsUpdateVo mallOrderGoodsAppend(@RequestBody OrderGoodsAppendBo bo) {
         ZCR responseDto = doZcPost("/api/mall/order/goods/append", bo);
+        log.info("同步商品协商发货时间参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("同步商品协商发货时间结果：{}", zcr);
         return zcr;
     }
 
@@ -483,7 +491,9 @@ public class TongJiPullController {
     @PostMapping("/mall/order/reject")
     public GoodsUpdateVo mallOrderReject(@RequestBody OrderRejectBo bo) throws ZhongcheException {
         ZCR responseDto = doZcPost("/api/mall/order/reject", bo);
+        log.info("拒单参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("拒单结果：{}", zcr);
         return zcr;
     }
 
@@ -491,15 +501,20 @@ public class TongJiPullController {
     @PostMapping("/mall/order/deliver/goods")
     public ZhongCheOrderDeliverVo mallOrderDeliverGoods(@RequestBody ZhongCheOrderDeliverBo bo) {
         ZCR responseDto = doZcPost("/api/mall/order/deliver/goods", bo);
+        log.info("发货参数:{}",JSONUtil.toJsonStr(bo));
         ZhongCheOrderDeliverVo zcr = parseZcResponse(responseDto, ZhongCheOrderDeliverVo.class);
+        log.info("发货结果：{}", zcr);
         return zcr;
     }
 
     //TODO 5.3.6	查询待处理订单列表
     @PostMapping("/mall/order/pending/list")
-    public PendingOrderListVo mallOrderPendingList(@RequestBody ZCTokenBo bo) {
+    public PendingOrderListVo mallOrderPendingList(@RequestBody PendingOrderListBo bo) {
+        bo.setAccount(username);
         ZCR responseDto = doZcPost("/api/mall/order/pending/list", bo);
+        log.info("查询待处理订单列表参数:{}",JSONUtil.toJsonStr(bo));
         PendingOrderListVo zcr = parseZcResponse(responseDto, PendingOrderListVo.class);
+        log.info("查询待处理订单列表结果：{}", zcr);
         return zcr;
     }
 
@@ -507,7 +522,9 @@ public class TongJiPullController {
     @PostMapping("/mall/order/delivered/notice")
     public GoodsUpdateVo mallOrderDeliveredNotice(@RequestBody OrderDeliveredNoticeBo bo) {
         ZCR responseDto = doZcPost("/api/mall/order/delivered/notice", bo);
+        log.info("妥投通知参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("妥投通知结果：{}", zcr);
         return zcr;
     }
 
@@ -515,7 +532,9 @@ public class TongJiPullController {
     @PostMapping("/mall/order/query/outgoing")
     public OutgoingVo mallOrderQueryOutgoing(@RequestBody OutgoingQueryBo bo) {
         ZCR responseDto = doZcPost("/api/mall/order/query/outgoing", bo);
+        log.info("查询发货单信息参数:{}",JSONUtil.toJsonStr(bo));
         OutgoingVo zcr = parseZcResponse(responseDto, OutgoingVo.class);
+        log.info("查询发货单信息结果：{}", zcr);
         return zcr;
     }
 
@@ -523,7 +542,9 @@ public class TongJiPullController {
     @PostMapping("/mall/prepare/order/detail")
     public PrepareOrderDetailRespVo mallPrepareOrderDetail(@RequestBody PrepareOrderDetailReqBo bo) {
         ZCR responseDto = doZcPost("/api/mall/prepare/order/detail", bo);
+        log.info("查询备货单详情参数:{}",JSONUtil.toJsonStr(bo));
         PrepareOrderDetailRespVo zcr = parseZcResponse(responseDto, PrepareOrderDetailRespVo.class);
+        log.info("查询备货单详情结果：{}", zcr);
         return zcr;
     }
 
@@ -531,7 +552,9 @@ public class TongJiPullController {
     @PostMapping("/mall/prepare/order/goods")
     public GoodsUpdateVo mallPrepareOrderGoods(@RequestBody PrepareOrderDataBo bo) {
         ZCR responseDto = doZcPost("/api/mall/prepare/order/goods", bo);
+        log.info("备货参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("备货结果：{}", zcr);
         return zcr;
     }
 
@@ -540,7 +563,9 @@ public class TongJiPullController {
     @PostMapping("/mall/prepare/order/confirm/cancel")
     public GoodsUpdateVo mallPrepareOrderConfirmCancel(@RequestBody PrepareOrderDetailReqBo bo) {
         ZCR responseDto = doZcPost("/api/mall/prepare/order/confirm/cancel", bo);
+        log.info("确认取消备货单参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("确认取消备货单结果：{}", zcr);
         return zcr;
     }
 
@@ -556,7 +581,9 @@ public class TongJiPullController {
     @PostMapping("/mall/order/cancel/audit/judge")
     public GoodsUpdateVo mallOrderCancelAuditJudge(@RequestBody OrderCancelAuditBo bo) {
         ZCR responseDto = doZcPost("/api/mall/order/cancel/audit/judge", bo);
+        log.info("审核订单取消参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("审核订单取消结果：{}", zcr);
         return zcr;
     }
     //5.4.1	查询售后单详情
@@ -574,7 +601,9 @@ public class TongJiPullController {
     @PostMapping("/mall/aftersale/detail")
     public AfterSaleDetailVo mallAftersaleDetail(@RequestBody AfterSaleDetailBo bo) {
         ZCR responseDto = doZcPost("/api/mall/aftersale/detail", bo);
+        log.info("查询售后单详情参数:{}",JSONUtil.toJsonStr(bo));
         AfterSaleDetailVo zcr = parseZcResponse(responseDto, AfterSaleDetailVo.class);
+        log.info("查询售后单详情结果：{}", zcr);
         return zcr;
     }
 
@@ -582,7 +611,9 @@ public class TongJiPullController {
     @PostMapping("/mall/aftersale/confirm")
     public GoodsUpdateVo mallAftersaleConfirm(@RequestBody AfterSaleConfirmBo bo) throws ZhongcheException{
         ZCR responseDto = doZcPost("/api/mall/aftersale/confirm", bo);
+        log.info("接受售后参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("接受售后结果：{}", zcr);
         return zcr;
     }
 
@@ -590,7 +621,9 @@ public class TongJiPullController {
     @PostMapping("/mall/aftersale/reject")
     public GoodsUpdateVo mallAftersaleReject(@RequestBody AfterSaleRejectBo bo) throws ZhongcheException{
         ZCR responseDto = doZcPost("/api/mall/aftersale/reject", bo);
+        log.info("拒绝售后参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("拒绝售后结果：{}", zcr);
         return zcr;
     }
 
@@ -598,7 +631,9 @@ public class TongJiPullController {
     @PostMapping("/mall/aftersale/return/goods/received")
     public GoodsUpdateVo mallAftersaleReturnGoodsReceived(@RequestBody AfterSaleReturnReceivedBo bo) throws ZhongcheException{
         ZCR responseDto = doZcPost("/api/mall/aftersale/return/goods/received", bo);
+        log.info("确认收到退货参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("确认收到退货结果：{}", zcr);
         return zcr;
     }
 
@@ -606,7 +641,9 @@ public class TongJiPullController {
     @PostMapping("/mall/aftersale/deliver/goods")
     public AfterSaleDeliverGoodsVo mallAftersaleDeliverGoods(@RequestBody AfterSaleDeliverGoodsBo bo) {
         ZCR responseDto = doZcPost("/api/mall/aftersale/deliver/goods", bo);
+        log.info("换货新品发货参数:{}",JSONUtil.toJsonStr(bo));
         AfterSaleDeliverGoodsVo zcr = parseZcResponse(responseDto, AfterSaleDeliverGoodsVo.class);
+        log.info("换货新品发货结果：{}", zcr);
         return zcr;
     }
 
@@ -614,7 +651,9 @@ public class TongJiPullController {
     @PostMapping("/mall/aftersale/pending/list")
     public AfterSalePendingListVo mallAftersalePendingList(@RequestBody AfterSalePendingListBo bo) {
         ZCR responseDto = doZcPost("/api/mall/aftersale/pending/list", bo);
+        log.info("查询待处理售后单列表参数:{}",JSONUtil.toJsonStr(bo));
         AfterSalePendingListVo zcr = parseZcResponse(responseDto, AfterSalePendingListVo.class);
+        log.info("查询待处理售后单列表结果：{}", zcr);
         return zcr;
     }
 
@@ -622,7 +661,9 @@ public class TongJiPullController {
     @PostMapping("/mall/aftersale/query/outgoing")
     public AfterSaleQueryOutgoingVo mallAftersaleQueryOutgoing(@RequestBody AfterSaleQueryOutgoingBo bo) {
         ZCR responseDto = doZcPost("/api/mall/aftersale/query/outgoing", bo);
+        log.info("查询换货新品发货单信息参数:{}",JSONUtil.toJsonStr(bo));
         AfterSaleQueryOutgoingVo zcr = parseZcResponse(responseDto, AfterSaleQueryOutgoingVo.class);
+        log.info("查询换货新品发货单信息结果：{}", zcr);
         return zcr;
     }
 
@@ -630,7 +671,9 @@ public class TongJiPullController {
     @PostMapping("/mall/aftersale/offline/create")
     public AfterSaleOfflineCreateVo mallAftersaleOfflineCreate(@RequestBody AfterSaleOfflineCreateBo bo) {
         ZCR responseDto = doZcPost("/api/mall/aftersale/offline/create", bo);
+        log.info("线下售后参数:{}",JSONUtil.toJsonStr(bo));
         AfterSaleOfflineCreateVo zcr = parseZcResponse(responseDto, AfterSaleOfflineCreateVo.class);
+        log.info("线下售后结果：{}", zcr);
         return zcr;
     }
 
@@ -638,7 +681,9 @@ public class TongJiPullController {
     @PostMapping("/mall/aftersale/refund")
     public GoodsUpdateVo mallAftersaleRefund(@RequestBody AfterSaleRefundBo bo) throws ZhongcheException{
         ZCR responseDto = doZcPost("/api/mall/aftersale/refund", bo);
+        log.info("确认退款参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("确认退款结果：{}", zcr);
         return zcr;
     }
 
@@ -647,7 +692,9 @@ public class TongJiPullController {
     @PostMapping("/mall/invoice/apply/detail")
     public InvoiceApplyDetailVo mallInvoiceApplyDetail(@RequestBody InvoiceApplyDetailBo bo) {
         ZCR responseDto = doZcPost("/api/mall/invoice/apply/detail", bo);
+        log.info("查询开票信息参数:{}",JSONUtil.toJsonStr(bo));
         InvoiceApplyDetailVo zcr = parseZcResponse(responseDto, InvoiceApplyDetailVo.class);
+        log.info("查询开票信息结果：{}", zcr);
         return zcr;
 
     }
@@ -656,7 +703,9 @@ public class TongJiPullController {
     @PostMapping("/mall/invoice/apply/orders")
     public InvoiceApplyOrdersVo mallInvoiceApplyOrders(@RequestBody InvoiceApplyOrdersBo bo) {
         ZCR responseDto = doZcPost("/api/mall/invoice/apply/orders", bo);
+        log.info("查询开票申请订单列表参数:{}",JSONUtil.toJsonStr(bo));
         InvoiceApplyOrdersVo zcr = parseZcResponse(responseDto, InvoiceApplyOrdersVo.class);
+        log.info("查询开票申请订单列表结果：{}", zcr);
         return zcr;
 
     }
@@ -665,7 +714,9 @@ public class TongJiPullController {
     @PostMapping("/mall/invoice/apply/reject")
     public GoodsUpdateVo mallInvoiceApplyReject(@RequestBody InvoiceApplyRejectBo bo) {
         ZCR responseDto = doZcPost("/api/mall/invoice/apply/reject", bo);
+        log.info("拒绝开票参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("拒绝开票结果：{}", zcr);
         return zcr;
     }
 
@@ -673,7 +724,9 @@ public class TongJiPullController {
     @PostMapping("/mall/invoice/sync/invoiceinfos")
     public GoodsUpdateVo mallInvoiceSyncInvoiceInfos(@RequestBody InvoiceSyncInvoiceInfosBo bo) {
         ZCR responseDto = doZcPost("/api/mall/invoice/sync/invoiceinfos", bo);
+        log.info("电商同步开票信息参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("电商同步开票信息结果：{}", zcr);
         return zcr;
     }
 
@@ -682,7 +735,9 @@ public class TongJiPullController {
     @PostMapping("/mall/invoice/sync/waybill")
     public GoodsUpdateVo mallInvoiceSyncWaybill(@RequestBody InvoiceSyncWaybillBo bo) {
         ZCR responseDto = doZcPost("/api/mall/invoice/sync/waybill", bo);
+        log.info("同步纸质发票邮寄信息参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("同步纸质发票邮寄信息结果：{}", zcr);
         return zcr;
     }
 
@@ -690,7 +745,9 @@ public class TongJiPullController {
     @PostMapping("/mall/invoice/delivered/notice")
     public GoodsUpdateVo mallInvoiceDeliveredNotice(@RequestBody InvoiceDeliveredNoticeBo bo) {
         ZCR responseDto = doZcPost("/api/mall/invoice/delivered/notice", bo);
+        log.info("发票妥投通知参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("发票妥投通知结果：{}", zcr);
         return zcr;
     }
 
@@ -698,7 +755,9 @@ public class TongJiPullController {
     @PostMapping("/mall/invoice/apply/waitlist")
     public InvoiceApplyWaitlistVo mallInvoiceApplyWaitList(@RequestBody InvoiceApplyWaitlistBo bo) {
         ZCR responseDto = doZcPost("/api/mall/invoice/apply/waitlist", bo);
+        log.info("查询待开票申请单列表参数:{}",JSONUtil.toJsonStr(bo));
         InvoiceApplyWaitlistVo zcr = parseZcResponse(responseDto, InvoiceApplyWaitlistVo.class);
+        log.info("查询待开票申请单列表结果：{}", zcr);
         return zcr;
     }
 
@@ -706,7 +765,9 @@ public class TongJiPullController {
     @PostMapping("/mall/invoice/refund/agree")
     public GoodsUpdateVo mallInvoiceRefundAgree(@RequestBody InvoiceRefundAgreeBo bo) {
         ZCR responseDto = doZcPost("/api/mall/invoice/refund/agree", bo);
+        log.info("电商同意退票参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("电商同意退票结果：{}", zcr);
         return zcr;
     }
 
@@ -715,7 +776,9 @@ public class TongJiPullController {
     @PostMapping("/mall/invoice/refund/finish")
     public GoodsUpdateVo mallInvoiceRefundFinish(@RequestBody InvoiceRefundFinishBo bo) {
         ZCR responseDto = doZcPost("/api/mall/invoice/refund/finish", bo);
+        log.info("电商确认完成退票参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo zcr = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("电商确认完成退票结果：{}", zcr);
         return zcr;
     }
 
@@ -723,7 +786,9 @@ public class TongJiPullController {
     @PostMapping("/mall/invoice/refund/reject")
     public GoodsUpdateVo mallInvoiceRefundReject(@RequestBody InvoiceRefundRejectBo bo) {
         ZCR responseDto = doZcPost("/api/mall/invoice/refund/reject", bo);
+        log.info("电商拒绝退票申请参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo goodsUpdateVo = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("电商拒绝退票申请结果：{}", goodsUpdateVo);
         return goodsUpdateVo;
     }
 
@@ -731,7 +796,9 @@ public class TongJiPullController {
     @PostMapping("/mall/settlement/detail")
     public SettlementDetailVo mallSettlementDetail(@RequestBody SettlementDetailBo bo) {
         ZCR responseDto = doZcPost("/api/mall/settlement/detail", bo);
+        log.info("查询结算单详情参数:{}",JSONUtil.toJsonStr(bo));
         SettlementDetailVo settlementDetailVo = parseZcResponse(responseDto, SettlementDetailVo.class);
+        log.info("查询结算单详情结果：{}", settlementDetailVo);
         return settlementDetailVo;
     }
 
@@ -739,7 +806,9 @@ public class TongJiPullController {
     @PostMapping("/mall/settlement/apply/orders")
     public SettlementApplyOrdersVo mallSettlementApplyOrders(@RequestBody SettlementApplyOrdersBo bo) {
         ZCR responseDto = doZcPost("/api/mall/settlement/apply/orders", bo);
+        log.info("查询结算单订单列表参数:{}",JSONUtil.toJsonStr(bo));
         SettlementApplyOrdersVo settlementApplyOrdersVo = parseZcResponse(responseDto, SettlementApplyOrdersVo.class);
+        log.info("查询结算单订单列表结果：{}", settlementApplyOrdersVo);
         return settlementApplyOrdersVo;
     }
 
@@ -748,7 +817,9 @@ public class TongJiPullController {
     @PostMapping("/mall/settlement/confirm")
     public GoodsUpdateVo mallSettlementConfirm(@RequestBody SettlementConfirmBo bo) {
         ZCR responseDto = doZcPost("/api/mall/settlement/confirm", bo);
+        log.info("结算单确认结算参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo goodsUpdateVo = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("结算单确认结算结果：{}", goodsUpdateVo);
         return goodsUpdateVo;
     }
 
@@ -756,7 +827,9 @@ public class TongJiPullController {
     @PostMapping("/mall/settlement/payment/detail")
     public SettlementPaymentDetailVo mallSettlementPaymentDetail( @RequestBody SettlementPaymentDetailBo bo) {
         ZCR responseDto = doZcPost("/api/mall/settlement/payment/detail", bo);
+        log.info("结算单付款详情参数:{}",JSONUtil.toJsonStr(bo));
         SettlementPaymentDetailVo settlementPaymentDetailVo = parseZcResponse(responseDto, SettlementPaymentDetailVo.class);
+        log.info("结算单付款详情结果：{}", settlementPaymentDetailVo);
         return settlementPaymentDetailVo;
 
     }
@@ -765,7 +838,9 @@ public class TongJiPullController {
     @PostMapping("/mall/settlement/confirm/payment")
     public GoodsUpdateVo mallSettlementConfirmPayment( @RequestBody SettlementConfirmPaymentBo bo) {
         ZCR responseDto = doZcPost("/api/mall/settlement/confirm/payment", bo);
+        log.info("结算单确认收款参数:{}",JSONUtil.toJsonStr(bo));
         GoodsUpdateVo goodsUpdateVo = parseZcResponse(responseDto, GoodsUpdateVo.class);
+        log.info("结算单确认收款结果：{}", goodsUpdateVo);
         return goodsUpdateVo;
     }
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/tongji/TongJiPushController.java

@@ -23,7 +23,7 @@ import org.dromara.external.api.zhongche.domain.Stocks;
 import org.dromara.external.api.zhongche.domain.ZCR;
 import org.dromara.external.api.zhongche.domain.bo.*;
 import org.dromara.external.api.zhongche.domain.vo.*;
-import org.dromara.external.controller.zhongche.handle.MallMessageDispatcher;
+import org.dromara.external.handler.MallMessageDispatcher;
 import org.dromara.external.domain.ExternalItem;
 import org.dromara.external.domain.ExternalProduct;
 import org.dromara.external.domain.ExternalProductCategory;
@@ -148,10 +148,10 @@ public class TongJiPushController {
             // 步骤6.3：用电商私钥生成SM2签名（Base64编码，直接赋值给sign）
             respSign = SM2SignatureUtils.sign(respSignContent, DEVELOPER_PRIVATE_KEY);
         } catch (JsonProcessingException e) {
-            log.error("同济电商品目查询接口 - 待签名字符串生成失败，业务JSON：{}", respBizJson, e);
+            log.error("中车电商品目查询接口 - 待签名字符串生成失败，业务JSON：{}", respBizJson, e);
             return ZCR.fail("5009", "接口响应签名生成异常（JSON转换失败）");
         } catch (Exception e) {
-            log.error("同济电商品目查询接口 - 响应签名生成失败，业务JSON：{}", respBizJson, e);
+            log.error("中车电商品目查询接口 - 响应签名生成失败，业务JSON：{}", respBizJson, e);
             return ZCR.fail("5010", "接口响应签名生成失败，请稍后重试");
         }
         // 7. 封装最终响应（严格复用你的ZCR.resetR）
@@ -159,7 +159,7 @@ public class TongJiPushController {
     }
 
     /**
-     * 数据库实体 → 同济品目VO（ProductCategory字段）
+     * 数据库实体 → 中车品目VO（ProductCategory字段）
      */
     private Catalog convertToCatalogVo(ProductCategoryRemoteVo category) {
         Catalog catalog = new Catalog();
@@ -315,15 +315,17 @@ public class TongJiPushController {
             stocksResult.setAreaId(areaId == null ? "" : areaId); // 地区id为空时赋值空字符串，保证格式统一
 
             if (nowInventory > 0){
-                //有货
-                stocksResult.setStockState("1");
-                stocksResult.setStockStateDesc("下单立即发货");
-                if (goodsNum < 50){
+
+                if (goodsNum <= nowInventory){
+                    //有货
+                    stocksResult.setStockState("1");
+                    stocksResult.setStockStateDesc("下单立即发货");
                     stocksResult.setRemainNum(nowInventory.intValue());
-                }else if (goodsNum <= 100){
-                    stocksResult.setRemainNum(-1);
                 }else {
-                    stocksResult.setRemainNum(goodsNum);
+                    //无货
+                    stocksResult.setStockState("5");
+                    stocksResult.setStockStateDesc("无货");
+                    stocksResult.setRemainNum(-999);
                 }
             }else {
                 //无货
@@ -496,6 +498,7 @@ public class TongJiPushController {
     // 4.5查询物流信息（物流信息尚未实现）
     @PostMapping("/get/track")
     public ZCR getTrack(@RequestBody ZCTokenBo zcTokenBo) {
+        log.info("物流信息查询 - 接口请求参数：{}", JSONUtil.toJsonStr(zcTokenBo));
         // 1. 公共请求参数校验（含签名、版本、clientId等，复用已有逻辑）
         ZCR checkResult = checkPublicParams(zcTokenBo);
         if (!"0".equals(checkResult.getRespCode())) {
@@ -561,6 +564,7 @@ public class TongJiPushController {
     //4.6 查询电商平台订单号
     @PostMapping("/get/mallOrderNo")
     public ZCR getMallOrderNo(@RequestBody ZCTokenBo zcTokenBo) {
+        log.info("查询电商订单号 - 请求参数：{}", JSONUtil.toJsonStr(zcTokenBo));
         //1. 公共请求参数校验
         ZCR checkResult = checkPublicParams(zcTokenBo);
         if (!"0".equals(checkResult.getRespCode())) {
@@ -571,7 +575,7 @@ public class TongJiPushController {
         try {
             verifyResult = SignParamUtils.verifyRequestSign(
                 zcTokenBo,
-                DEVELOPER_PUBLIC_KEY   // 同济给你的公钥
+                DEVELOPER_PUBLIC_KEY   // 中车给你的公钥
             );
         } catch (Exception e) {
             log.error("查询电商订单号 - 请求验签异常", e);
@@ -628,6 +632,7 @@ public class TongJiPushController {
     //4.7 查询电商平台售后单号
     @PostMapping("/get/mallAfterSaleNo")
     public ZCR getMallAfterSaleNo(@RequestBody ZCTokenBo zcTokenBo) {
+        log.info("查询售后单号 - 请求参数：{}", JSONUtil.toJsonStr(zcTokenBo));
         // 1. 公共请求参数校验
         ZCR checkResult = checkPublicParams(zcTokenBo);
         if (!"0".equals(checkResult.getRespCode())) {
@@ -724,7 +729,7 @@ public class TongJiPushController {
         // 5. 按消息类型处理业务
         MessageVo messageVo;
         try {
-            messageBo.setItemKey("zhongche");
+            messageBo.setItemKey("tongji");
             messageVo = mallMessageDispatcher.dispatch(messageBo);
         } catch (Exception e) {
             log.error("消息处理异常，messageId={}", messageBo.getId(), e);
@@ -869,7 +874,7 @@ public class TongJiPushController {
             }
         } catch (Exception e) {
             // 捕获验签过程中的异常（如JSON转换、Base64解码、SM2算法异常等）
-            log.error("同济电商接口签名校验异常，请求参数：{}", JSONUtil.toJsonStr(zcTokenBo), e);
+            log.error("中车电商接口签名校验异常，请求参数：{}", JSONUtil.toJsonStr(zcTokenBo), e);
             return ZCR.fail("5007", "接口签名校验异常，请稍后重试");
         }
 
@@ -903,7 +908,7 @@ public class TongJiPushController {
         bo.setAccessToken( "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiJzeXNfdXNlcjoyMDM3MDc2OTc3MjQ2MzE0NDk3Iiwicm5TdHIiOiJVTm84azZISzFLQXZ0eXJZOG9KZUtZV0dQbHd1MnlMZCIsImNsaWVudGlkIjoiZTVjZDdlNDg5MWJmOTVkMWQxOTIwNmNlMjRhN2IzMmUiLCJ0ZW5hbnRJZCI6IjAwMDAwMCIsInVzZXJJZCI6MjAzNzA3Njk3NzI0NjMxNDQ5NywidXNlck5hbWUiOiIyMDI0MDMxNjAwMSIsImRlcHRJZCI6MTk5NjgyODcyMjQwMDg5OTA3NCwiZGVwdE5hbWUiOiJBUEnlr7nmjqXnrqHnkIblubPlj7AiLCJkZXB0Q2F0ZWdvcnkiOiIifQ.BSrQtYQQIcy2chvcza4qVjj7x6wXw2OA5zAJb0vI-rk");
         // 注意：此时不要 setSign
 
-        // 2️⃣ 打印待签名内容（用于和同济排查）
+        // 2️⃣ 打印待签名内容（用于和中车排查）
         String signContent = SignParamUtils.getSignContent(bo);
         System.out.println("待签名字符串：");
         System.out.println(signContent);

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/ZhongChePullController.java

@@ -48,7 +48,7 @@ import java.util.List;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/api")
+@RequestMapping("/zhongche/api")
 public class ZhongChePullController {
 
     //正式环境

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/ZhongChePushController.java

@@ -25,7 +25,7 @@ import org.dromara.external.api.zhongche.domain.bo.AreaStockBo;
 import org.dromara.external.api.zhongche.domain.bo.*;
 import org.dromara.external.api.zhongche.domain.vo.*;
 import org.dromara.external.api.zhongche.domain.Catalog;
-import org.dromara.external.controller.zhongche.handle.MallMessageDispatcher;
+import org.dromara.external.handler.MallMessageDispatcher;
 import org.dromara.external.domain.ExternalItem;
 import org.dromara.external.domain.ExternalProduct;
 import org.dromara.external.domain.ExternalProductCategory;
@@ -58,7 +58,7 @@ import static org.dromara.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/api/mall")
+@RequestMapping("/zhongche/api/mall")
 public class ZhongChePushController {
     private final String key = GLOBAL_REDIS_KEY+"external:zhongche:token:";
     private final String CLIENT_ID = "KFZnKGiDsJ7";

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/dubbo/RemoteExternalProductServiceImpl.java

@@ -83,7 +83,9 @@ public class RemoteExternalProductServiceImpl implements RemoteExternalProductSe
             //不存在则新增存在则跳过
             if(Objects.equals(product.getType(),0)){
                 if (!externalProductService.exists(Wrappers.lambdaQuery(ExternalProduct.class)
-                    .eq(ExternalProduct::getProductId, product.getProductId()))){
+                    .eq(ExternalProduct::getProductId, product.getProductId())
+                    .eq(ExternalProduct::getItemId, product.getItemId())
+                )){
                     ExternalProduct externalProduct = BeanUtil.toBean(product, ExternalProduct.class);
                     externalProductService.save(externalProduct);
                 }

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/MallMessageDispatcher.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/MallMessageDispatcher.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle;
+package org.dromara.external.handler;
 
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/MallMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/MallMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle;
+package org.dromara.external.handler;
 
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/TongjiPushStrategy.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/TongjiPushStrategy.java

@@ -1,6 +1,8 @@
-package org.dromara.external.handler.impl;
+package org.dromara.external.handler;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -20,7 +22,6 @@ import org.dromara.external.domain.ExternalProduct;
 import org.dromara.external.domain.ExternalProductCategory;
 import org.dromara.external.domain.ExternalPushPoolLog;
 import org.dromara.external.domain.vo.ExternalProductVo;
-import org.dromara.external.handler.ProductPushStrategy;
 import org.dromara.external.mapper.ExternalProductMapper;
 import org.dromara.external.service.IExternalProductCategoryService;
 import org.dromara.external.service.IExternalPushPoolLogService;
@@ -44,7 +45,7 @@ import java.util.stream.Collectors;
 @Slf4j
 public class TongjiPushStrategy  implements ProductPushStrategy {
 
-    private final String username = "20240316001";
+    private final String username = "yoe365-tiyy";
 
     @DubboReference
     private final RemoteProductService remoteProductService;
@@ -74,6 +75,7 @@ public class TongjiPushStrategy  implements ProductPushStrategy {
             item.setProductStatus(externalProductVo.getProductStatus());
             item.setMemberPrice(productDetail.getMemberPrice());
             item.setProductImage(productDetail.getImageUrl());
+            item.setTaxRate(productDetail.getTaxRate());
         });
 
         // 收集所有 externalCategoryId
@@ -174,26 +176,52 @@ public class TongjiPushStrategy  implements ProductPushStrategy {
                 goodsImportItem.setDescription(productAggregateMap.get(item.getProductId()).getDescription());
 
                 //TODO 商品规格  默认 颜色：白色
-//            if (StringUtils.isNotBlank(productAggregateMap.get(item.getProductId()).getDiyAttributesList())) {
-//                String diyAttributesList = productAggregateMap.get(item.getProductId()).getDiyAttributesList();
-//                List<Map> list = JSONUtil.toList(diyAttributesList, Map.class);
-//                //格式为[{attributeKey:"",attributeValue:""}]转换成 [{key:value}]
-//                List<Map<String, String>> map = list.stream().map(e -> {
-//                    Map<String, String> result = new HashMap<>();
-//                    result.put(e.get("attributeKey").toString(), e.get("attributeValue").toString());
-//                    return result;
-//                }).collect(Collectors.toList());
-//                goodsImportItem.setProperties(JSONUtil.toJsonStr(map));
-//            }else{
-                goodsImportItem.setProperties("{\"保质期\":\"12个月\"}");
-//            }
+                if (StringUtils.isNotBlank(productAggregateMap.get(item.getProductId()).getDiyAttributesList())) {
+                    String diyAttributesList = productAggregateMap.get(item.getProductId()).getDiyAttributesList();
+                    List<Map> list = JSONUtil.toList(diyAttributesList, Map.class);
+                    //格式为{attributeKey:"",attributeValue:""}转换成 {key:value,key:value,key:value|:value}格式
+                    StringBuilder sb = new StringBuilder();
+                    sb.append("{");
+                    for (int i = 0; i < list.size(); i++) {
+                        Map<String, String> e = list.get(i);
+                        String attributeKey = e.get("attributeKey");
+                        String attributeValue = e.get("attributeValue");
+
+                        // 处理 attributeValue 可能是逗号拼接的情况
+                        if (attributeValue != null && attributeValue.contains(",")) {
+                            // 如果是逗号拼接的值，保持原样或根据需求处理
+                            sb.append("\"").append(attributeKey).append("\":\"").append(attributeValue).append("\"");
+                        } else {
+                            sb.append("\"").append(attributeKey).append("\":\"").append(attributeValue).append("\"");
+                        }
+
+                        // 添加逗号分隔符（除了最后一个元素）
+                        if (i < list.size() - 1) {
+                            sb.append(",");
+                        }
+                    }
+                    sb.append("}");
+                    goodsImportItem.setProperties(sb.toString());
+                }else{
+                    goodsImportItem.setProperties("{\"颜色\":\"混色\"}");
+                }
 
                 //TODO 是否自营
                 goodsImportItem.setIsSelfOperated(1);
                 //税率
-                goodsImportItem.setTax( new BigDecimal("0.13"));
+                if(ObjectUtil.isNotEmpty(item.getTaxRate())){
+                    goodsImportItem.setTax( item.getTaxRate());
+                }else {
+                    goodsImportItem.setTax( new BigDecimal("0.13"));
+                }
+
+
                 //TODO 税收编码   默认填 1
-                goodsImportItem.setTaxCode("107022301");
+                if (ObjectUtil.isNotEmpty(item.getTaxCode())){
+                    goodsImportItem.setTaxCode(item.getTaxCode());
+                }else{
+                    goodsImportItem.setTaxCode("107022301");
+                }
                 batchGoods.add(goodsImportItem);
             });
             GoodsImportBo bo = new GoodsImportBo();

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/YangGuangPushStrategy.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/YangGuangPushStrategy.java

@@ -1,4 +1,4 @@
-package org.dromara.external.handler.impl;
+package org.dromara.external.handler;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -7,7 +7,6 @@ import org.dromara.external.api.zhongche.domain.vo.GoodsPriceUpdateVo;
 import org.dromara.external.api.zhongche.domain.vo.GoodsStatusUpdateVo;
 import org.dromara.external.api.zhongche.domain.vo.GoodsUpdateVo;
 import org.dromara.external.domain.ExternalProduct;
-import org.dromara.external.handler.ProductPushStrategy;
 import org.dromara.product.api.domain.ProductVo;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/ZhongChePushStrategy.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/ZhongChePushStrategy.java

@@ -1,4 +1,4 @@
-package org.dromara.external.handler.impl;
+package org.dromara.external.handler;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -22,7 +22,6 @@ import org.dromara.external.domain.ExternalProduct;
 import org.dromara.external.domain.ExternalProductCategory;
 import org.dromara.external.domain.ExternalPushPoolLog;
 import org.dromara.external.domain.vo.ExternalProductVo;
-import org.dromara.external.handler.ProductPushStrategy;
 import org.dromara.external.mapper.ExternalProductMapper;
 import org.dromara.external.service.IExternalProductCategoryService;
 import org.dromara.external.service.IExternalPushPoolLogService;
@@ -30,9 +29,7 @@ import org.dromara.product.api.RemoteProductService;
 import org.dromara.product.api.domain.ProductVo;
 import org.dromara.product.api.domain.zhongche.dto.ProductAggregateDto;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
 import java.util.*;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/ZhongZhiPushStrategy.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/ZhongZhiPushStrategy.java

@@ -1,9 +1,7 @@
-package org.dromara.external.handler.impl;
+package org.dromara.external.handler;
 
-import org.dromara.external.api.zhongche.domain.bo.*;
 import org.dromara.external.api.zhongche.domain.vo.*;
 import org.dromara.external.domain.ExternalProduct;
-import org.dromara.external.handler.ProductPushStrategy;
 import org.dromara.product.api.domain.ProductVo;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/AccountActiveMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/AccountActiveMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
@@ -10,7 +10,7 @@ import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.GoodsImportVo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.domain.ExternalProduct;
 import org.dromara.external.domain.vo.ExternalProductVo;
 import org.dromara.external.enums.MallMessageTypeEnum;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/AfterSaleApplyMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/AfterSaleApplyMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -11,7 +11,7 @@ import org.dromara.common.core.domain.zhongche.aftersale.vo.AfterSaleDetailVo;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.dromara.product.api.domain.dto.OrderReturnDto;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/AfterSaleCancelMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/AfterSaleCancelMessageHandler.java

@@ -1,11 +1,11 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.springframework.stereotype.Component;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/AfterSaleDeliverMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/AfterSaleDeliverMessageHandler.java

@@ -1,11 +1,11 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.dromara.product.api.domain.dto.OrderReturnDto;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/AfterSaleReceiveConfirmMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/AfterSaleReceiveConfirmMessageHandler.java

@@ -1,11 +1,11 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.dromara.product.api.domain.dto.OrderReturnDto;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/AfterSaleRefundNoticeMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/AfterSaleRefundNoticeMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -8,7 +8,7 @@ import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.GoodsUpdateVo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.springframework.stereotype.Component;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/BillAbnormalPassMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/BillAbnormalPassMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/BillConfirmMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/BillConfirmMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/BillCreateMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/BillCreateMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/BillFinishMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/BillFinishMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/BillModifyMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/BillModifyMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/BillRejctPassMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/BillRejctPassMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/BillRuleCreateMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/BillRuleCreateMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/BillWaitInvoiceMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/BillWaitInvoiceMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -6,7 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/GoodsAuditPassMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/GoodsAuditPassMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.domain.ExternalProduct;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.external.service.IExternalProductService;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/GoodsAuditRejectMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/GoodsAuditRejectMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.domain.ExternalProduct;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.external.service.IExternalProductService;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/GoodsImportBlockMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/GoodsImportBlockMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 /**
  * author
@@ -13,7 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.domain.ExternalProduct;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.external.service.IExternalProductService;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/GoodsOffShelfMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/GoodsOffShelfMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.domain.ExternalProduct;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.external.service.IExternalProductService;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/GoodsOnShelfFailMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/GoodsOnShelfFailMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.domain.ExternalProduct;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.external.service.IExternalProductService;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/GoodsWaitAuditMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/GoodsWaitAuditMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
@@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.domain.ExternalProduct;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.external.service.IExternalProductService;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/InvoiceApplyMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/InvoiceApplyMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
@@ -13,7 +13,7 @@ import org.dromara.external.api.zhongche.domain.invoice.vo.InvoiceApplyDetailVo;
 import org.dromara.external.api.zhongche.domain.invoice.vo.InvoiceApplyOrdersVo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.springframework.stereotype.Component;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/OrderCancelApplyMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/OrderCancelApplyMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -7,7 +7,7 @@ import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.bo.OrderCancelAuditBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.dromara.product.api.domain.dto.OrderNoDto;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/OrderCancelMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/OrderCancelMessageHandler.java

@@ -1,11 +1,11 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteApiOrderService;
 import org.dromara.product.api.RemoteExternalOrderService;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/OrderCreateMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/OrderCreateMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONUtil;
@@ -17,7 +17,7 @@ import org.dromara.external.api.zhongche.domain.vo.AreaVo;
 import org.dromara.external.api.zhongche.domain.vo.GoodsUpdateVo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.domain.ExternalItem;
 import org.dromara.external.domain.ExternalProduct;
 import org.dromara.external.enums.MallMessageTypeEnum;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/OrderPayNoticeMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/OrderPayNoticeMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -10,7 +10,7 @@ import org.dromara.external.api.zhongche.domain.bo.OrderConfirmBo;
 import org.dromara.external.api.zhongche.domain.bo.OrderDetailBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.dromara.product.api.domain.dto.OrderNoDto;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/OrderPreConfirmMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/OrderPreConfirmMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -10,7 +10,7 @@ import org.dromara.external.api.zhongche.domain.bo.OrderConfirmBo;
 import org.dromara.external.api.zhongche.domain.bo.OrderDetailBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.dromara.product.api.domain.dto.OrderNoDto;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/OrderReceiveConfirmMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/OrderReceiveConfirmMessageHandler.java

@@ -1,11 +1,11 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.springframework.stereotype.Component;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/PrepareCancelMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/PrepareCancelMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -10,7 +10,7 @@ import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.bo.PrepareOrderDetailReqBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/PrepareConfirmMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/PrepareConfirmMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -8,7 +8,7 @@ import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.bo.PrepareOrderDetailReqBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.springframework.stereotype.Component;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/PrepareCreateMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/PrepareCreateMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -10,7 +10,7 @@ import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.bo.PrepareOrderDetailReqBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.springframework.stereotype.Component;
 

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/SettlementCreateMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/SettlementCreateMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.json.JSONUtil;
 import lombok.RequiredArgsConstructor;
@@ -8,7 +8,7 @@ import org.dromara.external.api.zhongche.domain.settlement.bo.SettlementDetailBo
 import org.dromara.external.api.zhongche.domain.settlement.vo.SettlementDetailVo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.springframework.stereotype.Component;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/StockLockMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/StockLockMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
@@ -11,7 +11,7 @@ import org.dromara.external.api.zhongche.domain.invoice.domain.InvoiceOrder;
 import org.dromara.external.api.zhongche.domain.invoice.vo.InvoiceApplyDetailVo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
 import org.dromara.external.controller.zhongche.ZhongChePullController;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteExternalOrderService;
 import org.dromara.product.api.RemoteProductService;

ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/controller/zhongche/handle/impl/StockUnlockMessageHandler.java → ruoyi-modules/ruoyi-external/src/main/java/org/dromara/external/handler/impl/StockUnlockMessageHandler.java

@@ -1,4 +1,4 @@
-package org.dromara.external.controller.zhongche.handle.impl;
+package org.dromara.external.handler.impl;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
@@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.external.api.zhongche.domain.bo.MessageBo;
 import org.dromara.external.api.zhongche.domain.vo.MessageVo;
-import org.dromara.external.controller.zhongche.handle.MallMessageHandler;
+import org.dromara.external.handler.MallMessageHandler;
 import org.dromara.external.enums.MallMessageTypeEnum;
 import org.dromara.product.api.RemoteProductService;
 import org.springframework.stereotype.Component;