From 60ad4eb0b923bd2fbf8a34f9c6fe78b9f8d54cb9 Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Sat, 31 Mar 2018 22:47:37 +0800 Subject: [PATCH] =?UTF-8?q?update[litemall-wx-api]:=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E7=AE=80=E5=8D=95=E7=9A=84=E8=BF=90=E8=B4=B9=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=EF=BC=8C=E5=8D=B3=E6=BB=A188=E5=88=99=E8=BF=90=E8=B4=B90?= =?UTF-8?q?=EF=BC=8C=E5=90=A6=E5=88=99=E8=BF=90=E8=B4=B98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linlinjava/litemall/wx/web/WxCartController.java | 10 ++++++---- .../linlinjava/litemall/wx/web/WxOrderController.java | 9 ++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java index 001dccb2..6fbd82ff 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCartController.java @@ -362,10 +362,6 @@ public class WxCartController { } } - - // 根据收货地址计算运费 - BigDecimal freightPrice = new BigDecimal(0.00); - // 获取可用的优惠券信息 // 使用优惠券减免的金额 BigDecimal couponPrice = new BigDecimal(0.00); @@ -388,6 +384,12 @@ public class WxCartController { checkedGoodsPrice = checkedGoodsPrice.add(cart.getRetailPrice().multiply(new BigDecimal(cart.getNumber()))); } + // 根据订单商品总价计算运费，满88则免运费，否则8元； + BigDecimal freightPrice = new BigDecimal(0.00); + if(checkedGoodsPrice.compareTo(new BigDecimal(88.00)) == -1){ + freightPrice = new BigDecimal(8.00); + } + // 可以使用的其他钱，例如用户积分 BigDecimal integralPrice = new BigDecimal(0.00); diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java index e81d104f..a2f3c622 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxOrderController.java @@ -198,9 +198,6 @@ public class WxOrderController { // 收货地址 LitemallAddress checkedAddress = addressService.findById(addressId); - // 根据收货地址计算运费 - BigDecimal freightPrice = new BigDecimal(0.00); - // 获取可用的优惠券信息 // 使用优惠券减免的金额 BigDecimal couponPrice = new BigDecimal(0.00); @@ -223,6 +220,12 @@ public class WxOrderController { checkedGoodsPrice = checkedGoodsPrice.add(cart.getRetailPrice().multiply(new BigDecimal(cart.getNumber()))); } + // 根据订单商品总价计算运费，满88则免运费，否则8元； + BigDecimal freightPrice = new BigDecimal(0.00); + if(checkedGoodsPrice.compareTo(new BigDecimal(88.00)) == -1){ + freightPrice = new BigDecimal(8.00); + } + // 可以使用的其他钱，例如用户积分 BigDecimal integralPrice = new BigDecimal(0.00);