order 添加快递费10元

coupon state ==5 (已使用)的券可用

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinCouponImpl.java

@@ -217,7 +217,7 @@ public class GoblinCouponImpl implements GoblinCouponService {
         for (GoblinUserCouponVo vo : voList) {
             if (vo.getUcouponId().equals(ucouponId)) {
                 //判断券状态 和 触发金额
-                if (vo.getState().equals(1) && vo.getTriggers().compareTo(totalPrice) <= 0) {
+                if ((vo.getState().equals(1) || vo.getState().equals(5)) && vo.getTriggers().compareTo(totalPrice) <= 0) {
                     if (vo.getUseScope().equals("0")) {
                         if (vo.getType().equals("1")) {//代金券
                             returnVo.setValue(vo.getValFace());

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java

@@ -371,7 +371,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
         if (addressesVo == null) {
             storeOrder.setPriceExpress(BigDecimal.ZERO);
         } else {
-            storeOrder.setPriceExpress(BigDecimal.ZERO);
+            storeOrder.setPriceExpress(BigDecimal.TEN);
         }
         storeOrder.setPriceTotal(storeTotalPrice.add(storeOrder.getPriceExpress()));
         storeOrder.setPriceActual(storeOrder.getPriceTotal().subtract(voucherPrice).subtract(storeVoucherPrice));