核销券添加商城渠道

order-application-service/src/main/java/cn/freemud/entities/dto/QueryOrdersResponseDto.java

@@ -134,6 +134,11 @@ public class QueryOrdersResponseDto {
              * 订单类型   1 外卖 2 预订单 3 商城 4 打包带走 5 店内就餐
              */
             private Integer orderType;
+
+            /**
+             * 新订单服务订单类型
+             */
+            private Integer newOrderType;
             /**
              * 销售类型或营销活动类型 1普通订单 2秒杀订单 3推广活动 4拼单订单
              */

order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java

@@ -24,6 +24,7 @@ import cn.freemud.enums.ActivityChannelEnum;
 import cn.freemud.enums.CouponReqType;
 import cn.freemud.enums.OrderAccountType;
 import cn.freemud.enums.ResponseResult;
+import cn.freemud.management.enums.OrderSource;
 import cn.freemud.service.coupon.CouponRelationFactory;
 import cn.freemud.service.coupon.CouponRelationService;
 import cn.freemud.service.impl.StoreServiceImpl;
@@ -37,6 +38,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.couponcenter.offline.service.OfflineCouponSdkService;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.ThirdPartyLog;
+import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.application.sdk.api.service.EmailAlertService;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
@@ -89,6 +91,10 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
             }
 
             Integer orderType = orderBean.getType();
+            //商城单子用NewOrderType
+            if(Objects.equals(OrderSource.MALL.getSource(),orderBean.getSource())){
+                orderType = orderBean.getNewOrderType();
+            }
             ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeEnumConvert2ActivityChannel(orderType);
             if (activityChannelEnum == null) {
                 activityChannelEnum = ActivityChannelEnum.pickup;