From d5ccf57765e2b7ac1f6d547ef0895e234902065b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 25 十二月 2024 10:09:27 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 2a492c5..c71b1b9 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -375,8 +375,10 @@
confirmOrderVo.setResidualPoint(appUser.getLavePoint().intValue());
//获取默认收货地址
UserAddress userAddress = userAddressClient.getDefaultUserAddress(userid).getData();
- userAddress.setIdStr(userAddress.getId().toString());
- confirmOrderVo.setUserAddress(userAddress);
+ if(null != userAddress){
+ userAddress.setIdStr(userAddress.getId().toString());
+ confirmOrderVo.setUserAddress(userAddress);
+ }
confirmOrderVo.setPaymentType(confirmOrder.getPaymentType());
//获取用户优惠券，用户全部优惠券，不能使用的需要标识出来置灰展示
PaymentUserCoupon paymentUserCoupon = new PaymentUserCoupon();
@@ -424,19 +426,19 @@
//获取快递策略
SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData();
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
- confirmOrderVo.setExpressFee(jsonObject.getBigDecimal("expressFee"));
- List<Integer> vip = jsonObject.getJSONArray("vip").toList(Integer.class);
+ confirmOrderVo.setExpressFee(jsonObject.getBigDecimal("freight"));
+ List<String> vip = Arrays.asList(jsonObject.getString("freeVip").split(","));
//包邮条件（所有会员或者满足条件的会员）
- if(vip.get(0) == -1 || vip.contains(appUser.getVipId())){
+ if(vip.get(0).equals("0") || vip.contains(appUser.getVipId().toString())){
if(confirmOrder.getPaymentType() == 1){
//现金支付，支付金额满足包邮条件
- BigDecimal cash = jsonObject.getBigDecimal("cash");
+ BigDecimal cash = jsonObject.getBigDecimal("freeFreight");
if(confirmOrderVo.getPayMoney().compareTo(cash) >= 0){
confirmOrderVo.setExpressFee(BigDecimal.ZERO);
}
}else{
//积分支付，支付积分是否满足包邮条件
- Integer point = jsonObject.getInteger("point");
+ Integer point = jsonObject.getInteger("freeIntegral");
if(confirmOrderVo.getOrderPoint().compareTo(point) >= 0){
confirmOrderVo.setExpressFee(BigDecimal.ZERO);
}
@@ -734,19 +736,19 @@
SystemConfig systemConfig = systemConfigClient.getSystemConfig(3).getData();
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
//快递费
- expressFee = jsonObject.getBigDecimal("expressFee");
- List<Integer> vip = jsonObject.getJSONArray("vip").toList(Integer.class);
+ expressFee = jsonObject.getBigDecimal("freight");
+ List<String> vip = Arrays.asList(jsonObject.getString("freeVip").split(","));
//包邮条件（所有会员或者满足条件的会员）
- if(vip.get(0) == -1 || vip.contains(appUser.getVipId())){
+ if(vip.get(0).equals("0") || vip.contains(appUser.getVipId().toString())){
if(shoppingCartPayment.getPaymentType() != 3){
//现金支付，支付金额满足包邮条件
- BigDecimal cash = jsonObject.getBigDecimal("cash");
+ BigDecimal cash = jsonObject.getBigDecimal("freeFreight");
if(paymentMoney.compareTo(cash) >= 0){
expressFee = BigDecimal.ZERO;
}
}else{
//积分支付，支付积分是否满足包邮条件
- Integer point = jsonObject.getInteger("point");
+ Integer point = jsonObject.getInteger("freeIntegral");
if(orderPoint.compareTo(point) >= 0){
expressFee = BigDecimal.ZERO;
}
--
Gitblit v1.7.1