Merge branch 'dev/2024/0506/update-admin-Y' of feifan/mall-backend-admin into master

添加订单的订阅和推送

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -350,6 +350,8 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
     public void deliveryOrder(TradeOrderDeliveryReqVO deliveryReqVO) {
         // 1.1 校验并获得交易订单（可发货）
         TradeOrderDO order = validateOrderDeliverable(deliveryReqVO.getId());
+        order.setLogisticsId(deliveryReqVO.getLogisticsId());
+        order.setLogisticsNo(deliveryReqVO.getLogisticsNo());
         // 1.2 校验 deliveryType 是否为快递，是快递才可以发货
         if (ObjectUtil.notEqual(order.getDeliveryType(), DeliveryTypeEnum.EXPRESS.getType())) {
             throw exception(ORDER_DELIVERY_FAIL_DELIVERY_TYPE_NOT_EXPRESS);
@@ -410,7 +412,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         subscribeParam.setParameters(subscribeParameters);
         subscribeParam.setCompany(deliveryExpress.getCode());
         subscribeParam.setNumber(order.getLogisticsNo());
-        subscribeParam.setKey(key);
+        subscribeParam.setKey("vAeIErtY7248");
 
         // 构建订阅请求对象，设置请求模式和参数
         SubscribeReq subscribeReq = new SubscribeReq();