Merge branch 'feature/20210609-v2.0.34-下单锁定配送券ID1030707-周晓航-合并张悦33版本' into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2188,7 +2188,7 @@ public class OrderAdapter {
             return orderAccountVos;
         }
         List<Integer> list = Arrays.asList(OrderSettlementType.FULL_REDUCTION.getIndex(),OrderSettlementType.CASH_COUPON.getIndex(),
-                OrderSettlementType.PRODUCT_COUPON.getIndex(),OrderSettlementType.DISCOUNT_COUPON.getIndex(),OrderSettlementType.POINTS.getIndex());
+                OrderSettlementType.PRODUCT_COUPON.getIndex(),OrderSettlementType.DISCOUNT_COUPON.getIndex(),OrderSettlementType.POINTS.getIndex(),OrderSettlementType.FREIGHT_COUPON.getIndex());
         for (QueryOrdersResponse.DataBean.OrderBean.OrderSettlement orderSettlement : orderSettlements){
             if(list.contains(orderSettlement.getSettlementType())){
                 OrderAccountVo accountVo = new OrderAccountVo();
@@ -2201,6 +2201,8 @@ public class OrderAdapter {
                     accountVo.setTypeName("满减");
                 } else if(type == OrderSettlementType.POINTS.getIndex()){
                     accountVo.setTypeName("积分抵扣");
+                }else if(type == OrderSettlementType.FREIGHT_COUPON.getIndex()) {
+                    accountVo.setTypeName("配送券");
                 }
                 int value = orderSettlement.getSettlementAmount().intValue();
                 accountVo.setDiscountAmount(value < 0 ? -value : value);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderSettlementType.java

@@ -34,6 +34,7 @@ public enum OrderSettlementType {
     SPELL_GROUP(25,"拼团"),
     TAKEAWAY_ADD_PRICE(46, "外卖加价购"),
     SUPER_PURCHASE(47, "超值加购"),
+    FREIGHT_COUPON(99, "配送券"),
     PRODUCT_COUPON(118, "商品券"),
 
     POINTS(200, "积分"),