From 0e62f33e20222ee507a6215e3011d486db2aefdf Mon Sep 17 00:00:00 2001 From: Menethil Date: Mon, 23 Jul 2018 03:31:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=B7=E6=A0=BC=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/linlinjava/litemall/wx/web/WxCartController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 cbe03f84..a393ebf7 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 @@ -8,6 +8,7 @@ import org.linlinjava.litemall.db.service.*; import org.linlinjava.litemall.core.util.JacksonUtil; import org.linlinjava.litemall.core.util.ResponseUtil; import org.linlinjava.litemall.wx.annotation.LoginUser; +import org.linlinjava.litemall.wx.service.SystemConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -469,8 +470,8 @@ public class WxCartController { // 根据订单商品总价计算运费，满88则免运费，否则8元； BigDecimal freightPrice = new BigDecimal(0.00); - if(checkedGoodsPrice.compareTo(new BigDecimal(88.00)) == -1){ - freightPrice = new BigDecimal(8.00); + if (checkedGoodsPrice.compareTo(SystemConfig.getFreightLimit()) < 0) { + freightPrice = SystemConfig.getFreight(); } // 可以使用的其他钱，例如用户积分