Merge branches 'feature/20210917_订单数据为空判断修复_wuping' and 'master' of…

Merge branches 'feature/20210917_订单数据为空判断修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

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

 package cn.freemud.service.impl;
 
+import cn.freemud.adapter.CreateOrderAdapter;
 import cn.freemud.adapter.LightApplicationConvertToAssortmentSdkAdapter;
 import cn.freemud.adapter.OrderAdapter;
 import cn.freemud.base.entity.BaseResponse;
@@ -120,6 +121,8 @@ public class SellCouponOrderServiceImpl {
     @Autowired
     private OrderAdapter orderAdapter;
     @Autowired
+    private CreateOrderAdapter createOrderAdapter;
+    @Autowired
     private OrderSdkAdapter orderSdkAdapter;
 //    @Autowired
 //    private RedisCache redisCache;
@@ -900,7 +903,7 @@ public class SellCouponOrderServiceImpl {
                     OrderSettlementCreateReq orderSettlementCreateReq = new OrderSettlementCreateReq();
                     Long discount = discounts.get(0).getDiscount();
                     orderSettlementCreateReq.setProductId(products.getPid());
-                    orderSettlementCreateReq.setSettlementType(discounts.get(0).getType());
+                    orderSettlementCreateReq.setSettlementType(createOrderAdapter.getOrderSettlementType(discounts.get(0).getType()));
                     orderSettlementCreateReq.setSettlementAmount(products.getFinalPrice()-discount);
                     orderSettlementCreateReq.setShopDiscountAmount(discount);
                     orderSettlementCreateReq.setNumber(1);