Merge branch 'feature/20230726_支付宝数据上报_wuping' of…

Merge branch 'feature/20230726_支付宝数据上报_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa

call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -252,6 +252,7 @@ public class OrderCallBackMQService {
         wechatReportOrderDto.setDeliveryNo(orderInfoReqs.getExpressNo());
         wechatReportOrderDto.setOrderType(orderInfoReqs.getOrderType());
         wechatReportOrderDto.setOrderStatus(orderInfoReqs.getOrderState());
+        wechatReportOrderDto.setOrderClient(orderInfoReqs.getOrderClient());
         if (StringUtils.isBlank(orderExtInfoDto.getPlatformMchId())) {
             // 获取当前商户微信支付mchId
             AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(userLoginInfoDto.getPartnerId(), userLoginInfoDto.getWxAppid());

call-back-service/src/main/java/cn/freemud/entities/dto/WechatReportOrderDto.java

@@ -107,6 +107,10 @@ public class WechatReportOrderDto {
     private Integer orderType;
     //订单状态
     private Integer orderStatus;
+    /**
+     * 下单渠道必填，根据此字段的值判断是自营或第三方，来走不同的状态机 详细见 orderClientType枚举
+     */
+    private Integer orderClient;
 
 
     private List<AccountBean> accountList;