Merge remote-tracking branch 'origin/hjc' into hjc

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

@@ -159,6 +159,8 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             }
             if (e.getMessage() == null) {
                 return ResponseDto.failure(ErrorMapping.get("20018"));//乱七八糟异常
+            } else if (e.getMessage().equals("平台券不可用")) {
+                return ResponseDto.failure(e.getMessage());
             } else if (e.getMessage().equals("无权购买")) {
                 return ResponseDto.failure(e.getMessage());
             } else if (e.getMessage().equals("平台券店铺券不可一起使用")) {
@@ -349,7 +351,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()));
         BigDecimal priceActual = storeOrder.getPriceTotal().subtract(voucherPrice).subtract(storeVoucherPrice);