From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 326 +++++++++++++++++++++++++-----------------------------
1 files changed, 150 insertions(+), 176 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 d589c8d..c04e268 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
@@ -15,19 +15,16 @@
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.mapper.ShoppingCartMapper;
import com.ruoyi.order.model.Order;
+import com.ruoyi.order.model.OrderBalancePayment;
import com.ruoyi.order.model.OrderGood;
import com.ruoyi.order.model.ShoppingCart;
-import com.ruoyi.order.service.CommissionService;
-import com.ruoyi.order.service.OrderGoodService;
-import com.ruoyi.order.service.OrderService;
-import com.ruoyi.order.service.ShoppingCartService;
+import com.ruoyi.order.service.*;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.feignClient.*;
import com.ruoyi.other.api.vo.GetGoodsBargainPrice;
import com.ruoyi.other.api.vo.GetGoodsShopByGoodsIds;
import com.ruoyi.other.api.vo.GetSeckillActivityInfo;
-import lombok.Data;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -35,75 +32,86 @@
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@Service
public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, ShoppingCart> implements ShoppingCartService {
-
+
@Resource
private TokenService tokenService;
-
+
@Resource
private GoodsClient goodsClient;
-
+
@Resource
private GoodsShopClient goodsShopClient;
-
+
@Resource
private AppUserClient appUserClient;
-
+
@Resource
private GoodsAreaClient goodsAreaClient;
-
+
@Resource
private GoodsVipClient goodsVipClient;
-
+
@Resource
private SeckillActivityInfoClient seckillActivityInfoClient;
-
+
@Resource
private GoodsBargainPriceClient goodsBargainPriceClient;
-
+
@Resource
private OrderService orderService;
-
+
@Resource
private OrderGoodService orderGoodService;
-
+
@Resource
private ShopClient shopClient;
-
+
@Resource
private OrderActivityInfoClient orderActivityInfoClient;
-
+
@Resource
private BaseSettingClient baseSettingClient;
-
+
@Resource
private UserAddressClient userAddressClient;
-
+
@Resource
private UserCouponClient userCouponClient;
-
+
@Resource
private SystemConfigClient systemConfigClient;
-
+
@Resource
private UserPointClient userPointClient;
-
+
@Resource
private BalanceChangeRecordClient balanceChangeRecordClient;
-
+
@Resource
private CommissionService commissionService;
-
+
@Resource
private VipSettingClient vipSettingClient;
-
+
@Resource
private UserChangeLogClient userChangeLogClient;
+
+
+
+
+
+
+
+ @Resource
+ private PointSettingClient pointSettingClient;
+
+ @Resource
+ private OrderBalancePaymentService orderBalancePaymentService;
@@ -132,8 +140,8 @@
List<MyShoppingCartVo> page = buildDetail(appUser, shopId, list, null);
return page;
}
-
-
+
+
/**
* 获取支付价格
* @param appUser
@@ -155,8 +163,11 @@
GetGoodsBargainPrice goodsBargainPrice = new GetGoodsBargainPrice();
goodsBargainPrice.setGoodsId(goodsId);
goodsBargainPrice.setVip(appUser.getVipId());
- goodsBargainPrice.setShopId(shopId);
- GoodsBargainPriceDetail bargainPriceDetail = goodsBargainPriceClient.getGoodsBargainPrice(goodsBargainPrice).getData();
+ GoodsBargainPriceDetail bargainPriceDetail = null;
+ if (shopId != null){
+ goodsBargainPrice.setShopId(shopId);
+ bargainPriceDetail = goodsBargainPriceClient.getGoodsBargainPrice(goodsBargainPrice).getData();
+ }
if(null == bargainPriceDetail){
//没有门店特价，判断地区价格配置
GoodsArea area = new GoodsArea();
@@ -167,15 +178,15 @@
GoodsArea goodsArea = goodsAreaClient.getGoodsArea(area).getData();
if(null == goodsArea){
//没有地区价格，则使用会员价格
- GoodsVip goodsVip = goodsVipClient.getGoodsVip(appUser.getVipId()).getData();
+ GoodsVip goodsVip = goodsVipClient.getGoodsVip(goodsId, appUser.getVipId()).getData();
if(null == goodsVip){
//没有配置价格，直接使用原始基础价格
return null;
}else{
price.setCash(goodsVip.getSellingPrice());
price.setPoint(goodsVip.getIntegral());
- price.setCashPayment(goodsVip.getCashPayment() == 1 ? true : false);
- price.setPointPayment(goodsVip.getPointPayment() == 1 ? true : false);
+ price.setCashPayment(goodsVip.getCashPayment() == 1);
+ price.setPointPayment(goodsVip.getPointPayment() == 1);
price.setEarnSpendingPoints(goodsVip.getEarnSpendingPoints());
price.setSuperiorSubcommission(goodsVip.getSuperiorSubcommission());
price.setSuperiorRebatePoints(goodsVip.getSuperiorRebatePoints());
@@ -191,8 +202,8 @@
}else{
price.setCash(goodsArea.getSellingPrice());
price.setPoint(goodsArea.getIntegral());
- price.setCashPayment(goodsArea.getCashPayment() == 1 ? true : false);
- price.setPointPayment(goodsArea.getPointPayment() == 1 ? true : false);
+ price.setCashPayment(goodsArea.getCashPayment() == 1);
+ price.setPointPayment(goodsArea.getPointPayment() == 1);
price.setEarnSpendingPoints(goodsArea.getEarnSpendingPoints());
price.setSuperiorSubcommission(goodsArea.getSuperiorSubcommission());
price.setSuperiorRebatePoints(goodsArea.getSuperiorRebatePoints());
@@ -208,8 +219,8 @@
}else{
price.setCash(bargainPriceDetail.getSellingPrice());
price.setPoint(bargainPriceDetail.getIntegral());
- price.setCashPayment(bargainPriceDetail.getSellingPrice() != null ? true : false);
- price.setPointPayment(bargainPriceDetail.getIntegral() != null ? true : false);
+ price.setCashPayment(bargainPriceDetail.getSellingPrice() != null);
+ price.setPointPayment(bargainPriceDetail.getIntegral() != null);
//门店特价，消费积分使用会员等级的消费积分
GoodsArea area = new GoodsArea();
area.setDistrictsCode(appUser.getDistrictCode());
@@ -241,8 +252,8 @@
if(goodsSeckill.getCashPayment() == 0 && goodsSeckill.getPointPayment() == 1){
price.setPoint(goodsSeckill.getIntegral());
}
- price.setCashPayment(goodsSeckill.getCashPayment() == 1 ? true : false);
- price.setPointPayment(goodsSeckill.getPointPayment() == 1 ? true : false);
+ price.setCashPayment(goodsSeckill.getCashPayment() == 1);
+ price.setPointPayment(goodsSeckill.getPointPayment() == 1);
price.setEndTime(goodsSeckill.getEndTime());
price.setEarnSpendingPoints(goodsSeckill.getEarnSpendingPoints());
price.setSuperiorSubcommission(goodsSeckill.getSuperiorSubcommission());
@@ -258,76 +269,9 @@
}
return price;
}
-
-
- @Data
- class Price {
- /**
- * 现金
- */
- private BigDecimal cash;
- /**
- * 积分
- */
- private Integer point;
- /**
- * 获取结束时间
- */
- private Long endTime;
- /**
- * 现金支付
- */
- private Boolean cashPayment;
- /**
- * 积分支付
- */
- private Boolean pointPayment;
- /**
- * 可获得消费积分
- */
- private Integer earnSpendingPoints;
- /**
- * 上级获得分佣金额
- */
- private BigDecimal superiorSubcommission;
- /**
- * 上级获得返佣积分
- */
- private Integer superiorRebatePoints;
- /**
- * 获取返佣积分上级类型（1=直推上级，2=直帮上级）
- */
- private Integer superiorType;
- /**
- * 核销门店可获得服务费
- */
- private BigDecimal servuceShopCharges;
- /**
- * 核销门店可获得服务积分
- */
- private Integer servuceShopPoints;
- /**
- * 技师可获得服务积分
- */
- private Integer technicianPoints;
- /**
- * 绑定门店可获得分佣金额
- */
- private BigDecimal boundShopCharges;
- /**
- * 绑定门店可获得返佣积分
- */
- private Integer boundShopPoints;
- /**
- * 绑定门店上级门店可获得分佣金额
- */
- private BigDecimal boundShopSuperiorsCharges;
- /**
- * 绑定门店上级门店可获得返佣积分
- */
- private Integer boundShopSuperiorsPoints;
- }
-
+
+
+
@Override
public Long addGoods(ShoppingCart shoppingCart) {
@@ -336,8 +280,8 @@
this.save(shoppingCart);
return shoppingCart.getId();
}
-
-
+
+
/**
* 修改购物车数量
* @param setGoodsNumber
@@ -362,8 +306,8 @@
}
return R.ok();
}
-
-
+
+
/**
* 确认购物车订单
* @param confirmOrder
@@ -431,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();
@@ -480,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);
}
@@ -500,8 +446,8 @@
}
return confirmOrderVo;
}
-
-
+
+
/**
* 构建购物车商品列表
* @param appUser
@@ -536,8 +482,8 @@
//使用商品的基础价格
price.setCash(1 == goods.getCashPayment() ? goods.getSellingPrice() : null);
price.setPoint(1 == goods.getPointPayment() ? goods.getIntegral() : null);
- price.setCashPayment(goods.getCashPayment() == 1 ? true : false);
- price.setPointPayment(goods.getPointPayment() == 1 ? true : false);
+ price.setCashPayment(goods.getCashPayment() == 1);
+ price.setPointPayment(goods.getPointPayment() == 1);
}
vo.setCash(price.getCash());
vo.setPoint(price.getPoint());
@@ -550,7 +496,7 @@
goodsShop.setGoodsId(shoppingCart.getGoodsId());
goodsShop.setShopId(shopId);
GoodsShop goodsShop1 = goodsShopClient.getGoodsShop(goodsShop).getData();
- vo.setVerifiable(goods.getAppointStore() == 1 && null == goodsShop1 ? false : true);
+ vo.setVerifiable(goods.getAppointStore() != 1 || null != goodsShop1);
//判断当前数量是否已经超出限购数量（需要计算已经购买的数量）
if(null == goods.getPurchaseLimit() || -1 == goods.getPurchaseLimit()){
vo.setPurchaseLimit(false);
@@ -558,12 +504,12 @@
List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().eq(Order::getAppUserId, appUser.getId()).eq(Order::getDelFlag, 0).in(Order::getOrderStatus, Arrays.asList(4, 8)));
List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList());
int sum = 0;
- if(orderIds.size() > 0){
+ if(!orderIds.isEmpty()){
List<OrderGood> orderGoodList = orderGoodService.list(new LambdaQueryWrapper<OrderGood>().in(OrderGood::getOrderId, orderIds)
.eq(OrderGood::getGoodsId, shoppingCart.getGoodsId()).eq(OrderGood::getDelFlag, 0));
sum = orderGoodList.stream().mapToInt(OrderGood::getNum).sum();
}
- vo.setPurchaseLimit((num + sum) > goods.getPurchaseLimit() ? true : false);
+ vo.setPurchaseLimit((num + sum) > goods.getPurchaseLimit());
}
vo.setDistributionMode(goods.getDistributionMode());
vo.setEarnSpendingPoints(price.getEarnSpendingPoints());
@@ -581,8 +527,8 @@
}
return page;
}
-
-
+
+
/**
* 购物车支付操作
* @param shoppingCartPayment
@@ -619,7 +565,7 @@
}
ids.add(id);
}
-
+
List<ShoppingCart> list = this.listByIds(ids);
//构建商品明细列表
List<MyShoppingCartVo> goodsList = buildDetail(appUser, shopId, list, objects);
@@ -689,7 +635,7 @@
BigDecimal discountAmount = BigDecimal.ZERO;
//活动优惠金额
BigDecimal activityAmount = BigDecimal.ZERO;
-
+
//减去优惠券优惠金额
CouponInfoVo couponInfoVo = null;
if(null != shoppingCartPayment.getUserCouponId() && 3 != shoppingCartPayment.getPaymentType()){
@@ -732,7 +678,7 @@
paymentMoney = paymentMoney.add(cash);
}
}
-
+
//满减
if(1 == couponInfoVo.getCouponType() && couponInfoVo.getConditionAmount().compareTo(goodsMoney) <= 0){
goodsMoney = goodsMoney.subtract(couponInfoVo.getDiscountAmount());
@@ -757,16 +703,16 @@
paymentMoney = paymentMoney.add(goodsMoney);
}
}
-
+
//查询当前是否有订单活动
OrderActivityInfo orderActivityInfo = orderActivityInfoClient.getNowOrderActivityInfo(appUser.getVipId()).getData();
BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData();
//系统活动设置（优惠券和活动能否同时使用）
- boolean useSimultaneously = baseSetting.getContent().equals("1") ? true : false;
+ boolean useSimultaneously = baseSetting.getContent().equals("1");
//满XX才打折，只有现金才能优惠
//如果使用优惠券，则需要判断是否可以和同时使用，且活动满足使用条件。
//没有使用优惠券，只需要判断是都满足使用条件
- if(((useSimultaneously && null != shoppingCartPayment.getUserCouponId()) || null == shoppingCartPayment.getUserCouponId()) &&
+ if((useSimultaneously || null == shoppingCartPayment.getUserCouponId()) &&
null != orderActivityInfo && shoppingCartPayment.getPaymentType() != 3 && orderActivityInfo.getConditionAmount().compareTo(paymentMoney) <= 0){
BigDecimal paymentMoney1 = orderActivityInfo.getDiscount().divide(new BigDecimal(10)).multiply(paymentMoney);
BigDecimal bigDecimal = paymentMoney.subtract(paymentMoney1).setScale(2, RoundingMode.HALF_EVEN);
@@ -774,7 +720,7 @@
paymentMoney = paymentMoney1;
activityAmount = activityAmount.add(bigDecimal);
}
-
+
//可获得的消费积分
int earnPoint = 0;
for (MyShoppingCartVo myShoppingCartVo : goodsList) {
@@ -783,26 +729,26 @@
if(null != shoppingCartPayment.getUserAddressId()){
userAddressClient.getUserAddressById(shoppingCartPayment.getUserAddressId()).getData();
}
-
+
//获取快递策略，计算快递费
BigDecimal expressFee = BigDecimal.ZERO;
if(null != shoppingCartPayment.getUserAddressId()){
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;
}
@@ -855,7 +801,7 @@
order.setDelFlag(0);
order.setCreateTime(LocalDateTime.now());
order.setExpressPayMethod(shoppingCartPayment.getFreightPaymentType());
-
+
if(2 == shoppingCartPayment.getPaymentType()){
BigDecimal balance = appUser.getBalance();
if(balance.compareTo(paymentMoney) < 0){
@@ -869,7 +815,7 @@
return R.fail("账户余额不足");
}
}
-
+
orderService.save(order);
//构建订单明细数据
for (MyShoppingCartVo myShoppingCartVo : goodsList) {
@@ -909,28 +855,33 @@
orderGood.setBoundShopSuperiorsPoints(myShoppingCartVo.getBoundShopSuperiorsPoints());
orderGoodService.save(orderGood);
}
-
+
//开始构建支付数据
//现金支付
paymentMoney = paymentMoney.add(expressFee).setScale(2, RoundingMode.HALF_EVEN);
if(1 == shoppingCartPayment.getPaymentType()){
//调起微信支付 TODO 待完善
-
-
-
+
+
+
}
//账户余额
+ BigDecimal redPacketAmount = BigDecimal.ZERO;
+ BigDecimal distributionAmount = BigDecimal.ZERO;
if(2 == shoppingCartPayment.getPaymentType()){
BigDecimal totalRedPacketAmount = appUser.getTotalRedPacketAmount();
BigDecimal totalDistributionAmount = appUser.getTotalDistributionAmount();
BigDecimal balance = appUser.getBalance();
+ //红包金额满足支付
if(paymentMoney.compareTo(totalRedPacketAmount) <= 0){
totalRedPacketAmount = totalRedPacketAmount.subtract(paymentMoney);
balance = balance.subtract(paymentMoney);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setBalance(balance);
+ redPacketAmount = paymentMoney;
}else{
paymentMoney = paymentMoney.subtract(totalRedPacketAmount);
+ redPacketAmount = totalRedPacketAmount;
totalRedPacketAmount = BigDecimal.ZERO;
if(paymentMoney.compareTo(totalDistributionAmount) <= 0){
totalDistributionAmount = totalDistributionAmount.subtract(paymentMoney);
@@ -938,6 +889,7 @@
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
+ distributionAmount = paymentMoney;
}else{
paymentMoney = paymentMoney.subtract(totalDistributionAmount);
totalDistributionAmount = BigDecimal.ZERO;
@@ -945,17 +897,23 @@
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
+ distributionAmount = totalDistributionAmount;
}
}
//构建积分流水记录
if(earnPoint > 0){
+ PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
+ int earnPoint1 = earnPoint;
+ if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
+ earnPoint1 = earnPoint1 * (100 - pointSetting.getBuyPoint());
+ }
appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
- appUser.setLavePoint(appUser.getLavePoint() + earnPoint);
+ appUser.setLavePoint(appUser.getLavePoint() + earnPoint1);
appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
-
+
UserPoint userPoint = new UserPoint();
userPoint.setType(1);
- userPoint.setHistoricalPoint(appUser.getLavePoint() - earnPoint);
+ userPoint.setHistoricalPoint(appUser.getLavePoint() - earnPoint1);
userPoint.setVariablePoint(earnPoint);
userPoint.setBalance(appUser.getLavePoint());
userPoint.setCreateTime(LocalDateTime.now());
@@ -979,6 +937,9 @@
balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
//修改订支付状态
order.setPayStatus(2);
+ if(goods.getType() == 2 && null == shoppingCartPayment.getUserAddressId()){
+ order.setOrderStatus(2);
+ }
orderService.updateById(order);
//删除购物车数据
this.removeBatchByIds(ids);
@@ -988,37 +949,32 @@
//积分支付
if(3 == shoppingCartPayment.getPaymentType()){
Integer lavePoint = appUser.getLavePoint();
- appUser.setLavePoint(lavePoint - orderPoint);
+ PointSetting pointSetting = pointSettingClient.getPointSetting(appUser.getVipId()).getData();
+ int earnPoint1 = earnPoint;
+ //计算可用积分比例
+ if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
+ earnPoint1 = earnPoint1 * (100 - pointSetting.getBuyPoint());
+ }
+ appUser.setLavePoint(appUser.getLavePoint() - orderPoint);
appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
- appUser.setLavePoint(appUser.getLavePoint() + earnPoint);
+ appUser.setLavePoint(appUser.getLavePoint() + earnPoint1);
appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
- appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
appUser.setLastShopTime(LocalDateTime.now());
appUserClient.editAppUserById(appUser);
//检查消费积分满足后升级会员
vipUpgrade(appUser);
-
+
//构建积分流水记录
UserPoint userPoint = new UserPoint();
- userPoint.setType(4);
+ userPoint.setType(1);
userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(orderPoint);
+ Integer point = appUser.getLavePoint() - lavePoint;
+ userPoint.setVariablePoint(point >= 0 ? point : point * -1);
userPoint.setBalance(appUser.getLavePoint());
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(appUser.getId());
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
- if(earnPoint > 0){
- userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(appUser.getLavePoint() - earnPoint);
- userPoint.setVariablePoint(earnPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(appUser.getId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
- }
//如果有运费，需要先扣除账户积分，再进行支付。支付成功后修改订单状态，未支付成功则回退积分，删除的订单
if(expressFee.compareTo(BigDecimal.ZERO) > 0){
if(shoppingCartPayment.getFreightPaymentType() == 1){
@@ -1033,8 +989,10 @@
balance = balance.subtract(expressFee);
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setBalance(balance);
+ redPacketAmount = expressFee;
}else{
expressFee = expressFee.subtract(totalRedPacketAmount);
+ redPacketAmount = totalRedPacketAmount;
totalRedPacketAmount = BigDecimal.ZERO;
if(expressFee.compareTo(totalDistributionAmount) <= 0){
totalDistributionAmount = totalDistributionAmount.subtract(expressFee);
@@ -1042,6 +1000,7 @@
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
+ distributionAmount = expressFee;
}else{
expressFee = expressFee.subtract(totalDistributionAmount);
totalDistributionAmount = BigDecimal.ZERO;
@@ -1049,9 +1008,10 @@
appUser.setTotalRedPacketAmount(totalRedPacketAmount);
appUser.setTotalDistributionAmount(totalDistributionAmount);
appUser.setBalance(balance);
+ distributionAmount = totalDistributionAmount;
}
}
-
+
appUserClient.editAppUserById(appUser);
//构建余额明细变动记录
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
@@ -1066,6 +1026,9 @@
balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
//修改订支付状态
order.setPayStatus(2);
+ if(goods.getType() == 2 && null == shoppingCartPayment.getUserAddressId()){
+ order.setOrderStatus(2);
+ }
orderService.updateById(order);
//删除购物车数据
this.removeBatchByIds(ids);
@@ -1073,15 +1036,26 @@
}else{
//修改订支付状态
order.setPayStatus(2);
+ if(goods.getType() == 2 && null == shoppingCartPayment.getUserAddressId()){
+ order.setOrderStatus(2);
+ }
orderService.updateById(order);
//删除购物车数据
this.removeBatchByIds(ids);
}
}
+ //添加账户余额支付明细
+ if(redPacketAmount.compareTo(BigDecimal.ZERO) > 0 || distributionAmount.compareTo(BigDecimal.ZERO) > 0){
+ OrderBalancePayment orderBalancePayment = new OrderBalancePayment();
+ orderBalancePayment.setOrderId(order.getId());
+ orderBalancePayment.setRedPacketAmount(redPacketAmount);
+ orderBalancePayment.setDistributionAmount(distributionAmount);
+ orderBalancePaymentService.save(orderBalancePayment);
+ }
return R.ok(order.getId().toString());
}
-
-
+
+
public String getNumber(Integer size){
String str = "";
for (Integer i = 0; i < size; i++) {
@@ -1089,8 +1063,8 @@
}
return str;
}
-
-
+
+
/**
* 会员等级变化
* @param appUser
@@ -1102,7 +1076,7 @@
VipSetting vipSetting3 = vipSettingClient.getVipSetting(3).getData();
Integer vipLevelUpShopRole = vipSetting3.getVipLevelUpShopRole();
Integer vipLevelUpShop = vipSetting3.getVipLevelUpShop();
- if(1 == vipLevelUpShopRole && appUser.getVipId() < 3 && shopPoint >= vipLevelUpShop){
+ if(null != vipLevelUpShopRole && 1 == vipLevelUpShopRole && appUser.getVipId() < 3 && shopPoint >= vipLevelUpShop){
appUser.setVipId(3);
appUserClient.editAppUserById(appUser);
//添加等级变化记录
@@ -1120,7 +1094,7 @@
VipSetting vipSetting2 = vipSettingClient.getVipSetting(2).getData();
vipLevelUpShopRole = vipSetting2.getVipLevelUpShopRole();
vipLevelUpShop = vipSetting2.getVipLevelUpShop();
- if(1 == vipLevelUpShopRole && appUser.getVipId() < 2 && shopPoint >= vipLevelUpShop){
+ if(null != vipLevelUpShopRole && 1 == vipLevelUpShopRole && appUser.getVipId() < 2 && shopPoint >= vipLevelUpShop){
appUser.setVipId(2);
appUserClient.editAppUserById(appUser);
//添加等级变化记录
--
Gitblit v1.7.1