From 071153064e6771e377ee148712be012dba9e13c5 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 19:25:35 +0800
Subject: [PATCH] 1.
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 281 ++++++++++++++++++++++++++++----------------------------
1 files changed, 141 insertions(+), 140 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 a45cea5..dc8cb2b 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
@@ -6,10 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.*;
-import com.ruoyi.account.api.model.AppUser;
-import com.ruoyi.account.api.model.BalanceChangeRecord;
-import com.ruoyi.account.api.model.UserAddress;
-import com.ruoyi.account.api.model.UserPoint;
+import com.ruoyi.account.api.model.*;
import com.ruoyi.account.api.vo.CouponInfoVo;
import com.ruoyi.account.api.vo.PaymentUserCoupon;
import com.ruoyi.account.api.vo.PaymentUserCouponVo;
@@ -30,7 +27,6 @@
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;
@@ -38,75 +34,80 @@
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;
+
+
+
+
+
+
/**
* 获取购物车列表
* @param type
@@ -129,8 +130,8 @@
List<MyShoppingCartVo> page = buildDetail(appUser, shopId, list, null);
return page;
}
-
-
+
+
/**
* 获取支付价格
* @param appUser
@@ -152,8 +153,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();
@@ -171,8 +175,8 @@
}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());
@@ -188,8 +192,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());
@@ -205,8 +209,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());
@@ -238,8 +242,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());
@@ -255,76 +259,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) {
@@ -333,8 +270,8 @@
this.save(shoppingCart);
return shoppingCart.getId();
}
-
-
+
+
/**
* 修改购物车数量
* @param setGoodsNumber
@@ -359,8 +296,8 @@
}
return R.ok();
}
-
-
+
+
/**
* 确认购物车订单
* @param confirmOrder
@@ -497,8 +434,8 @@
}
return confirmOrderVo;
}
-
-
+
+
/**
* 构建购物车商品列表
* @param appUser
@@ -578,8 +515,8 @@
}
return page;
}
-
-
+
+
/**
* 购物车支付操作
* @param shoppingCartPayment
@@ -616,7 +553,7 @@
}
ids.add(id);
}
-
+
List<ShoppingCart> list = this.listByIds(ids);
//构建商品明细列表
List<MyShoppingCartVo> goodsList = buildDetail(appUser, shopId, list, objects);
@@ -664,9 +601,14 @@
//积分支付的订单积分
Integer orderPoint = 0;
if(3 != shoppingCartPayment.getPaymentType()){
- orderMoney = goodsList.stream().map(MyShoppingCartVo::getCash).reduce(BigDecimal::add).get();
+ for (MyShoppingCartVo myShoppingCartVo : goodsList) {
+ orderMoney = orderMoney.add(myShoppingCartVo.getCash().multiply(new BigDecimal(myShoppingCartVo.getNumber())));
+ }
}else{
orderPoint = goodsList.stream().mapToInt(MyShoppingCartVo::getPoint).sum();
+ for (MyShoppingCartVo myShoppingCartVo : goodsList) {
+ orderPoint += (myShoppingCartVo.getPoint() * myShoppingCartVo.getNumber());
+ }
if(appUser.getLavePoint().intValue() < orderPoint){
return R.fail("账户剩余积分不足");
}
@@ -681,7 +623,7 @@
BigDecimal discountAmount = BigDecimal.ZERO;
//活动优惠金额
BigDecimal activityAmount = BigDecimal.ZERO;
-
+
//减去优惠券优惠金额
CouponInfoVo couponInfoVo = null;
if(null != shoppingCartPayment.getUserCouponId() && 3 != shoppingCartPayment.getPaymentType()){
@@ -724,7 +666,7 @@
paymentMoney = paymentMoney.add(cash);
}
}
-
+
//满减
if(1 == couponInfoVo.getCouponType() && couponInfoVo.getConditionAmount().compareTo(goodsMoney) <= 0){
goodsMoney = goodsMoney.subtract(couponInfoVo.getDiscountAmount());
@@ -749,7 +691,7 @@
paymentMoney = paymentMoney.add(goodsMoney);
}
}
-
+
//查询当前是否有订单活动
OrderActivityInfo orderActivityInfo = orderActivityInfoClient.getNowOrderActivityInfo(appUser.getVipId()).getData();
BaseSetting baseSetting = baseSettingClient.getBaseSetting(4).getData();
@@ -766,13 +708,16 @@
paymentMoney = paymentMoney1;
activityAmount = activityAmount.add(bigDecimal);
}
-
+
//可获得的消费积分
- int earnPoint = goodsList.stream().mapToInt(MyShoppingCartVo::getEarnSpendingPoints).sum();
+ int earnPoint = 0;
+ for (MyShoppingCartVo myShoppingCartVo : goodsList) {
+ earnPoint += (myShoppingCartVo.getEarnSpendingPoints() * myShoppingCartVo.getNumber());
+ }
if(null != shoppingCartPayment.getUserAddressId()){
userAddressClient.getUserAddressById(shoppingCartPayment.getUserAddressId()).getData();
}
-
+
//获取快递策略，计算快递费
BigDecimal expressFee = BigDecimal.ZERO;
if(null != shoppingCartPayment.getUserAddressId()){
@@ -812,7 +757,7 @@
order.setGoodName(goodName.substring(0, goodName.length() - 1));
Goods goods = goodsClient.getGoodsById(goodsList.get(0).getGoodsId()).getData();
order.setOrderType(goods.getType());
- order.setOrderStatus(1);
+ order.setOrderStatus(goods.getType() == 1 ? 3 : 1);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
order.setOrderNumber("QJS" + getNumber(3) + sdf.format(new Date()));
order.setTotalAmount(orderMoney.setScale(2, RoundingMode.HALF_EVEN));
@@ -844,7 +789,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){
@@ -858,7 +803,7 @@
return R.fail("账户余额不足");
}
}
-
+
orderService.save(order);
//构建订单明细数据
for (MyShoppingCartVo myShoppingCartVo : goodsList) {
@@ -898,15 +843,15 @@
orderGood.setBoundShopSuperiorsPoints(myShoppingCartVo.getBoundShopSuperiorsPoints());
orderGoodService.save(orderGood);
}
-
+
//开始构建支付数据
//现金支付
paymentMoney = paymentMoney.add(expressFee).setScale(2, RoundingMode.HALF_EVEN);
if(1 == shoppingCartPayment.getPaymentType()){
//调起微信支付 TODO 待完善
-
-
-
+
+
+
}
//账户余额
if(2 == shoppingCartPayment.getPaymentType()){
@@ -940,7 +885,8 @@
if(earnPoint > 0){
appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
appUser.setLavePoint(appUser.getLavePoint() + earnPoint);
-
+ appUser.setTotalPoint(appUser.getTotalPoint() + earnPoint);
+
UserPoint userPoint = new UserPoint();
userPoint.setType(1);
userPoint.setHistoricalPoint(appUser.getLavePoint() - earnPoint);
@@ -951,6 +897,8 @@
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
}
+ appUser.setShopAmount(appUser.getShopAmount().add(paymentMoney).setScale(2, RoundingMode.HALF_EVEN));
+ appUser.setLastShopTime(LocalDateTime.now());
appUserClient.editAppUserById(appUser);
//构建余额明细变动记录
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
@@ -968,6 +916,8 @@
orderService.updateById(order);
//删除购物车数据
this.removeBatchByIds(ids);
+ //检查消费积分满足后升级会员
+ vipUpgrade(appUser);
}
//积分支付
if(3 == shoppingCartPayment.getPaymentType()){
@@ -975,7 +925,13 @@
appUser.setLavePoint(lavePoint - orderPoint);
appUser.setShopPoint(appUser.getShopPoint() + earnPoint);
appUser.setLavePoint(appUser.getLavePoint() + earnPoint);
+ 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);
@@ -1029,7 +985,7 @@
appUser.setBalance(balance);
}
}
-
+
appUserClient.editAppUserById(appUser);
//构建余额明细变动记录
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
@@ -1058,8 +1014,8 @@
}
return R.ok(order.getId().toString());
}
-
-
+
+
public String getNumber(Integer size){
String str = "";
for (Integer i = 0; i < size; i++) {
@@ -1067,4 +1023,49 @@
}
return str;
}
+
+
+ /**
+ * 会员等级变化
+ * @param appUser
+ */
+ public void vipUpgrade(AppUser appUser){
+ Integer shopPoint = appUser.getShopPoint();
+ Integer vipId = appUser.getVipId();
+ //钻石会员
+ VipSetting vipSetting3 = vipSettingClient.getVipSetting(3).getData();
+ Integer vipLevelUpShopRole = vipSetting3.getVipLevelUpShopRole();
+ Integer vipLevelUpShop = vipSetting3.getVipLevelUpShop();
+ if(1 == vipLevelUpShopRole && appUser.getVipId() < 3 && shopPoint >= vipLevelUpShop){
+ appUser.setVipId(3);
+ appUserClient.editAppUserById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogClient.saveUserChangeLog(userChangeLog);
+ return;
+ }
+ //黄金会员
+ VipSetting vipSetting2 = vipSettingClient.getVipSetting(2).getData();
+ vipLevelUpShopRole = vipSetting2.getVipLevelUpShopRole();
+ vipLevelUpShop = vipSetting2.getVipLevelUpShop();
+ if(1 == vipLevelUpShopRole && appUser.getVipId() < 2 && shopPoint >= vipLevelUpShop){
+ appUser.setVipId(2);
+ appUserClient.editAppUserById(appUser);
+ //添加等级变化记录
+ UserChangeLog userChangeLog = new UserChangeLog();
+ userChangeLog.setDelFlag(0);
+ userChangeLog.setCreateTime(LocalDateTime.now());
+ userChangeLog.setAppUserId(appUser.getId());
+ userChangeLog.setBeforeVipId(vipId);
+ userChangeLog.setAfterVipId(appUser.getVipId());
+ userChangeLog.setChangeType(1);
+ userChangeLogClient.saveUserChangeLog(userChangeLog);
+ }
+ }
}
--
Gitblit v1.7.1