Skip to content

O
order-group
Commit 171e72c4 by 徐康
Options

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

parents e1ff9719 59c9da31
Showing with 3 additions and 3 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
...@@ -315,9 +315,9 @@ public class CalculationServiceImpl { ...@@ -315,9 +315,9 @@ public class CalculationServiceImpl {
if (storeInfo == null || storeInfo.getStatusCode() != 100 || storeInfo.getBizVO() == null) { if (storeInfo == null || storeInfo.getStatusCode() != 100 || storeInfo.getBizVO() == null) {
throw new ServiceException(ResponseResult.STORE_ITEM_NOT_DELIVERY); throw new ServiceException(ResponseResult.STORE_ITEM_NOT_DELIVERY);
} }
if (storeInfo.getBizVO().getDeliveryPrice() == 0) { // if (storeInfo.getBizVO().getDeliveryPrice() == 0) {
throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR); // throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
} // }
Double deliveryPrice = storeInfo.getBizVO().getDeliveryPrice()*100; Double deliveryPrice = storeInfo.getBizVO().getDeliveryPrice()*100;
deliveryAmount = deliveryPrice.longValue(); deliveryAmount = deliveryPrice.longValue();
return deliveryAmount; return deliveryAmount;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment