fixed 会员折扣计算

fuint-application/src/main/java/com/fuint/common/param/CartListParam.java

@@ -39,4 +39,7 @@ public class CartListParam extends PageParam implements Serializable {
     @ApiModelProperty(value="下单会员ID", name="userId")
     private Integer userId;
 
+    @ApiModelProperty(value="订单模式", name="orderMode")
+    private String orderMode;
+
 }

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -2048,6 +2048,16 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
             deliveryFee = new BigDecimal(mtSetting.getValue());
         }
 
+        // 会员折扣
+        BigDecimal payDiscount = new BigDecimal("1");
+        MtUserGrade userGrade = userGradeService.queryUserGradeById(merchantId, Integer.parseInt(userInfo.getGradeId()), userInfo.getId());
+        if (userGrade != null) {
+            if (userGrade.getDiscount() > 0) {
+                payDiscount = new BigDecimal(userGrade.getDiscount()).divide(new BigDecimal("10"), BigDecimal.ROUND_CEILING, 3);
+            }
+        }
+        payPrice = payPrice.multiply(payDiscount).add(deliveryFee);
+
         result.put("list", cartDtoList);
         result.put("totalNum", totalNum);
         result.put("totalPrice", totalPrice);

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientCartController.java

@@ -184,19 +184,20 @@ public class ClientCartController extends BaseController {
     @ApiOperation(value = "获取购物车列表")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject list(HttpServletRequest request, @RequestBody CartListParam cartListParam) throws BusinessCheckException {
+    public ResponseObject list(HttpServletRequest request, @RequestBody CartListParam params) throws BusinessCheckException {
         String token = request.getHeader("Access-Token");
         String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
         Integer storeId = request.getHeader("storeId") == null ? 0 : Integer.parseInt(request.getHeader("storeId"));
         String platform = request.getHeader("platform") == null ? "" : request.getHeader("platform");
-        Integer goodsId = cartListParam.getGoodsId() == null ? 0 : cartListParam.getGoodsId();
-        Integer skuId = cartListParam.getSkuId() == null ? 0 : cartListParam.getSkuId();
-        Integer buyNum = cartListParam.getBuyNum() == null ? 1 : cartListParam.getBuyNum();
-        String cartIds = cartListParam.getCartIds() == null ? "" : cartListParam.getCartIds();
-        Integer userCouponId = cartListParam.getCouponId() == null ? 0 : cartListParam.getCouponId();// 会员卡券ID
-        Integer userId = cartListParam.getUserId() == null ? 0 : cartListParam.getUserId(); // 会员ID
-        String point = cartListParam.getPoint() == null ? "" : cartListParam.getPoint();
-        String hangNo = cartListParam.getHangNo() == null ? "" : cartListParam.getHangNo();
+        Integer goodsId = params.getGoodsId() == null ? 0 : params.getGoodsId();
+        Integer skuId = params.getSkuId() == null ? 0 : params.getSkuId();
+        Integer buyNum = params.getBuyNum() == null ? 1 : params.getBuyNum();
+        String cartIds = params.getCartIds() == null ? "" : params.getCartIds();
+        Integer userCouponId = params.getCouponId() == null ? 0 : params.getCouponId();// 会员卡券ID
+        Integer userId = params.getUserId() == null ? 0 : params.getUserId(); // 会员ID
+        String point = params.getPoint() == null ? "" : params.getPoint();
+        String hangNo = params.getHangNo() == null ? "" : params.getHangNo();
+        String orderMode = params.getOrderMode() == null ? OrderModeEnum.ONESELF.getKey() : params.getOrderMode();
         Integer merchantId = merchantService.getMerchantId(merchantNo);
         boolean isUsePoint = false;
         if (point.equals("true")) {
@@ -286,7 +287,7 @@ public class ClientCartController extends BaseController {
         if (merchantId <= 0) {
             merchantId = mtUser.getMerchantId();
         }
-        result = orderService.calculateCartGoods(merchantId, mtUser.getId(), cartList, userCouponId, isUsePoint, platform, OrderModeEnum.EXPRESS.getKey());
+        result = orderService.calculateCartGoods(merchantId, mtUser.getId(), cartList, userCouponId, isUsePoint, platform, orderMode);
 
         return getSuccessResult(result);
     }