From 3f1e7569d9956837d2fa305dd78a7f9583dfa3e5 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期日, 23 七月 2023 18:46:30 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 419 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 392 insertions(+), 27 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 6120b1d..64336ed 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -19,7 +19,6 @@
import com.ruoyi.order.domain.pojo.order.OrderGoods;
import com.ruoyi.order.domain.vo.*;
import com.ruoyi.order.mapper.order.OrderMapper;
-import com.ruoyi.order.mapper.order.UserServiceRecordMapper;
import com.ruoyi.order.service.order.ConsumerGoodsService;
import com.ruoyi.order.service.order.OrderGoodsService;
import com.ruoyi.order.service.order.OrderService;
@@ -46,6 +45,8 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
@@ -99,9 +100,6 @@
private RemoteActivityService remoteActivityService;
@Resource
- private UserServiceRecordMapper userServiceRecordMapper;
-
- @Resource
private RedisService redisService;
@Autowired
@@ -124,6 +122,20 @@
AppSureOrderGoodsVo appSureOrderGoodsVo;
// 获取购买商品列表
List<AppBuyGoodsDto> appBuyGoodsDtoList = appSureOrderDto.getAppBuyGoodsDtoList();
+ //获取商品列表
+ StringJoiner goodsIdSJ = new StringJoiner(",");
+ for (AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList) {
+ goodsIdSJ.add(appBuyGoodsDto.getGoodsId());
+ }
+ List<Goods> goodsList = remoteGoodsService.listGoodsByGoodsId(goodsIdSJ.toString()).getData();
+ Map<String, Goods> goodsMap = goodsList.stream()
+ .collect(Collectors.toMap(Goods::getGoodsId, Function.identity()));
+ Boolean haveDeposit = false;
+ for(Goods goods : goodsList){
+ if(goods.getSubscription()!=null&&goods.getSubscription().compareTo(BigDecimal.ZERO)>0){
+ haveDeposit = true;
+ }
+ }
String goodsId;
Integer buyNum;
BigDecimal buyNumBig;
@@ -132,10 +144,12 @@
BigDecimal goodsPrice;
BigDecimal goodsTotalPrice;
BigDecimal goodsRealPrice;
+ MerBaseDto merBaseDto = new MerBaseDto();
+ merBaseDto.setUserId(userId);
+ merBaseDto.setShopId(appSureOrderDto.getShopId());
// 获取用户优惠券列表
- List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(userId).getData();
- // 初始化商品优惠券列表
- List<AppMemberCouponVo> appGoodsMemberCouponVoList;
+ List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(merBaseDto).getData();
+
// 将优惠券列表转换为Map，以优惠券ID为键
Map<String, AppMemberCouponVo> appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
AppMemberCouponVo appMemberCouponVo;
@@ -161,7 +175,7 @@
buyNum = appBuyGoodsDto.getBuyNum();
memberCouponId = appBuyGoodsDto.getMemberCouponId();
// 获取商品信息
- goods = remoteGoodsService.getGoods(goodsId).getData();
+ goods = goodsMap.get(goodsId);
if(goods.getGoodsStatus()!=1){
throw new ServiceException(AppErrorConstant.GOODS_DOWN);
}
@@ -225,8 +239,16 @@
appSureOrderGoodsVo.setCouponDiscount(discountMoney);
appSureOrderGoodsVo.setGoodsRealPrice(goodsRealPrice);
goodsDeposit = goods.getSubscription();
- if (goodsDeposit == null) {
- goodsDeposit = new BigDecimal("0.00");
+ // 获取商品押金
+ goodsDeposit = goods.getSubscription();
+ if (goodsDeposit != null && goodsDeposit.compareTo(BigDecimal.ZERO)>0) {
+ goodsDeposit = goodsDeposit.multiply(buyNumBig);
+ }else{
+ if(haveDeposit){
+ goodsDeposit = goodsRealPrice;
+ }else{
+ goodsDeposit = new BigDecimal("0.00");
+ }
}
appSureOrderGoodsVo.setGoodsDeposit(goodsDeposit);
// 计算订单总金额
@@ -238,6 +260,33 @@
}
//处理优惠券列表
if (appMemberCouponVoList != null && !appMemberCouponVoList.isEmpty()) {
+ for (AppMemberCouponVo entity : appMemberCouponVoList) {
+ if(userCouponIdSet!=null&&userCouponIdSet.contains(entity.getMemberCouponId())){
+ entity.setUseFlag(1);
+ }else{
+ entity.setUseFlag(0);
+ }
+ }
+ // 过滤商品优惠券列表
+ List<AppMemberCouponVo> appGoodsMemberCouponVoList;
+ for(AppSureOrderGoodsVo sureOrderGoodsVo : appSureOrderGoodsVoList) {
+ appGoodsMemberCouponVoList = new ArrayList<>();
+ for(AppMemberCouponVo entity : appMemberCouponVoList){
+ if(StringUtils.isBlank(entity.getRelGoodsIds())||entity.getRelGoodsIds().contains(sureOrderGoodsVo.getGoodsId())){
+ if(entity.getCouponType()!=1){
+ appGoodsMemberCouponVoList.add(entity);
+ }else{
+ if(entity.getMoneyThreshold().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())>0){
+ appGoodsMemberCouponVoList.add(entity);
+ }
+ }
+
+ }
+ }
+ sureOrderGoodsVo.setAppMemberCouponVoList(appGoodsMemberCouponVoList);
+ }
+ }
+ /*if (appMemberCouponVoList != null && !appMemberCouponVoList.isEmpty()) {
// 获取商品关联优惠券
appGoodsMemberCouponVoList = new ArrayList<>();
for(AppSureOrderGoodsVo sureOrderGoodsVo : appSureOrderGoodsVoList){
@@ -288,7 +337,7 @@
}
sureOrderGoodsVo.setAppMemberCouponVoList(appGoodsMemberCouponVoList);
}
- }
+ }*/
// 设置订单相关金额
appSureOrderVo.setOrderGoodsMoney(orderGoodsMoney);
appSureOrderVo.setCouponDiscount(couponDiscount);
@@ -367,8 +416,10 @@
appPanicBuyVo.setGoodsTotalPrice(goodsTotalPrice);
appPanicBuyVo.setGoodsRealPrice(goodsRealPrice);
goodsDeposit = activityGoodsGetVo.getActivitySubscription();
- if (goodsDeposit == null) {
+ if (goodsDeposit == null || goodsDeposit.compareTo(BigDecimal.ZERO)==0) {
goodsDeposit = new BigDecimal("0.00");
+ }else{
+ goodsDeposit = goodsDeposit.multiply(buyNumBig);
}
appPanicBuyVo.setGoodsDeposit(goodsDeposit);
orderGoodsMoney = orderGoodsMoney.add(goodsTotalPrice);
@@ -397,6 +448,20 @@
AppSureOrderGoodsVo appSureOrderGoodsVo;
// 获取购买的商品列表
List<AppBuyGoodsDto> appBuyGoodsDtoList = appPlaceOrderDto.getAppBuyGoodsDtoList();
+ StringJoiner goodsIdSJ = new StringJoiner(",");
+ for (AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList) {
+ goodsIdSJ.add(appBuyGoodsDto.getGoodsId());
+ }
+ //获取商品列表
+ List<Goods> goodsList = remoteGoodsService.listGoodsByGoodsId(goodsIdSJ.toString()).getData();
+ Map<String, Goods> goodsMap = goodsList.stream()
+ .collect(Collectors.toMap(Goods::getGoodsId, Function.identity()));
+ Boolean haveDeposit = false;
+ for(Goods goods : goodsList){
+ if(goods.getSubscription()!=null&&goods.getSubscription().compareTo(BigDecimal.ZERO)>0){
+ haveDeposit = true;
+ }
+ }
// 初始化变量
String goodsId;
Integer buyNum;
@@ -409,8 +474,11 @@
BigDecimal goodsPrice;
BigDecimal goodsTotalPrice;
BigDecimal goodsRealPrice;
+ MerBaseDto merBaseDto = new MerBaseDto();
+ merBaseDto.setUserId(userId);
+ merBaseDto.setShopId(appPlaceOrderDto.getShopId());
// 获取用户优惠券列表
- List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(userId).getData();
+ List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(merBaseDto).getData();
// 将用户优惠券列表转换为Map，方便后续查找
Map<String, AppMemberCouponVo> appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
AppMemberCouponVo appMemberCouponVo;
@@ -441,7 +509,7 @@
goodsId = appBuyGoodsDto.getGoodsId();
memberCouponId = appBuyGoodsDto.getMemberCouponId();
// 获取商品信息
- goods = remoteGoodsService.getGoods(goodsId).getData();
+ goods = goodsMap.get(goodsId);
// 设置商品信息
appSureOrderGoodsVo.setGoodsId(goodsId);
appSureOrderGoodsVo.setGoodsName(goods.getGoodsName());
@@ -504,8 +572,14 @@
appSureOrderGoodsVo.setGoodsRealPrice(goodsRealPrice);
// 获取商品押金
goodsDeposit = goods.getSubscription();
- if (goodsDeposit == null) {
- goodsDeposit = new BigDecimal("0.00");
+ if (goodsDeposit != null && goodsDeposit.compareTo(BigDecimal.ZERO)>0) {
+ goodsDeposit = goodsDeposit.multiply(buyNumBig);
+ }else{
+ if(haveDeposit){
+ goodsDeposit = goodsRealPrice;
+ }else{
+ goodsDeposit = new BigDecimal("0.00");
+ }
}
appSureOrderGoodsVo.setGoodsDeposit(goodsDeposit);
// 计算商品总数量、商品总价、优惠总金额、支付押金、支付金额
@@ -567,19 +641,20 @@
order.setReceivableMoney(orderPayMoney);
order.setReceivableDeposit(orderPayDeposit);
order.setChangeReceivableMoney(orderPayMoney);
- order.setPayType(appPlaceOrderDto.getPayType());
// 根据支付类型计算支付金额
- if (order.getPayType() == 1) {
+ if (appPlaceOrderDto.getPayType() == 1) {
order.setPayMoney(orderPayMoney);
order.setOnlinePayMoney(orderPayMoney);
appPlaceOrderVo.setPayMoney(orderPayMoney);
appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
+ order.setPayType(1);
order.setCloseFlag(1);
- } else if (order.getPayType() == 2) {
+ } else if (appPlaceOrderDto.getPayType() == 2) {
order.setPayMoney(orderPayDeposit);
order.setOnlinePayMoney(orderPayDeposit);
appPlaceOrderVo.setPayMoney(orderPayDeposit);
appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
+ order.setPayType(2);
order.setCloseFlag(0);
}
order.setOrderRemark(appPlaceOrderDto.getOrderRemark());
@@ -597,7 +672,7 @@
appPlaceOrderVo.setOrderId(orderId);
appPlaceOrderVo.setOrderNo(orderNo);
// 调用支付
- //使用优惠券
+ //减去优惠券
if(memberCouponSJ!=null){
remoteCouponService.useMemberCoupon(memberCouponSJ.toString());
}
@@ -613,6 +688,7 @@
delayTask.setEndTime(DateUtils.addMinutes(new Date(),delayTime));
delayTask.setRedisKey(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + orderId);
remoteConfigService.addDelayTask(delayTask);
+ appPlaceOrderVo.setPayDeadlineTime(DateUtils.addMinutes(order.getCreateTime(),delayTime));
return appPlaceOrderVo;
}
@@ -694,6 +770,7 @@
String orderGoodsId;
// 创建商品类型集合
HashSet<String> goodsTypeSet = new HashSet<>();
+ HashSet<String> goodsNurseSet = new HashSet<>();
// 创建商品订单对象，并设置商品ID，商品名称，商品介绍，商品类型
appSureOrderGoodsVo = new AppSureOrderGoodsVo();
useCoupon = 0;
@@ -724,8 +801,10 @@
appSureOrderGoodsVo.setGoodsRealPrice(goodsRealPrice);
// 获取商品押金
goodsDeposit = activityGoodsGetVo.getActivitySubscription();
- if (goodsDeposit == null) {
+ if (goodsDeposit == null || goodsDeposit.compareTo(BigDecimal.ZERO)==0) {
goodsDeposit = new BigDecimal("0.00");
+ }else{
+ goodsDeposit = goodsDeposit.multiply(buyNumBig);
}
appSureOrderGoodsVo.setGoodsDeposit(goodsDeposit);
// 计算商品数量，订单商品金额，优惠券折扣，订单支付押金，订单支付金额
@@ -768,6 +847,13 @@
} else if (goods.getGoodsType() == 4) {
goodsTypeSet.add("单品");
}
+ String goodsNurse = goods.getGoodsNurses();
+ if(StringUtils.isNotBlank(goodsNurse)){
+ String[] goodsNurseArr = goodsNurse.split(",");
+ for(String str : goodsNurseArr){
+ goodsNurseSet.add(str);
+ }
+ }
// 创建订单，并设置订单ID，删除标志，订单状态，订单号，订单来源，店铺ID，用户ID，订单金额，优惠券金额，折扣金额，应收金额，应收押金，变动应收金额，支付类型
Order order = new Order();
order.setOrderId(orderId);
@@ -783,19 +869,20 @@
order.setReceivableMoney(orderPayMoney);
order.setReceivableDeposit(orderPayDeposit);
order.setChangeReceivableMoney(orderPayMoney);
- order.setPayType(appPlaceActivityDto.getPayType());
// 根据支付类型设置订单支付金额，在线支付金额，订单支付金额，未支付金额，关闭标志
- if (order.getPayType() == 1) {
+ if (appPlaceActivityDto.getPayType() == 1) {
order.setPayMoney(orderPayMoney);
order.setOnlinePayMoney(orderPayMoney);
appPlaceOrderVo.setPayMoney(orderPayMoney);
appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
+ order.setPayType(1);
order.setCloseFlag(1);
- } else if (order.getPayType() == 2) {
+ } else if (appPlaceActivityDto.getPayType() == 2) {
order.setPayMoney(orderPayDeposit);
order.setOnlinePayMoney(orderPayDeposit);
appPlaceOrderVo.setPayMoney(orderPayDeposit);
appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
+ order.setPayType(2);
order.setCloseFlag(0);
}
// 设置订单备注，商品数量，创建时间
@@ -805,10 +892,11 @@
// 保存订单
this.save(order);
// 更新用户商品类型
- if (goodsTypeSet != null && goodsTypeSet.size() > 0) {
+ if (goodsTypeSet != null || goodsNurseSet!= null) {
AppMemberGoodsTypeDto appMemberGoodsTypeDto = new AppMemberGoodsTypeDto();
appMemberGoodsTypeDto.setUserId(userId);
appMemberGoodsTypeDto.setGoodsTypeSet(goodsTypeSet);
+ appMemberGoodsTypeDto.setGoodsNurseSet(goodsNurseSet);
remoteMemberService.updateMemberGoodsType(appMemberGoodsTypeDto);
}
// 设置订单ID和订单号
@@ -836,6 +924,7 @@
delayTask.setEndTime(DateUtils.addMinutes(new Date(),delayTime));
delayTask.setRedisKey(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + orderId);
remoteConfigService.addDelayTask(delayTask);
+ appPlaceOrderVo.setPayDeadlineTime(DateUtils.addMinutes(order.getCreateTime(),delayTime));
return appPlaceOrderVo;
}
@@ -863,6 +952,10 @@
Shop shopTemp = remoteShopService.getShop(shopIdLong).getData();
shopMap.put(shopIdLong, shopTemp);
});
+ Integer delayTime = 30;
+ if(redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)){
+ delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME);
+ }
for (AppUserOrderPageVo appUserOrderPageVo : appUserOrderPageVoList) {
shop = shopMap.get(appUserOrderPageVo.getShopId());
appUserOrderPageVo.setShopName(shop.getShopName());
@@ -873,6 +966,7 @@
appUserOrderPageVo.setSameShop(0);
}
appUserOrderPageVo.setVerifyCode("1-" + appUserOrderPageVo.getOrderId());
+ appUserOrderPageVo.setEndTime(DateUtils.addMinutes(appUserOrderPageVo.getCreateTime(),delayTime));
}
}
return appUserOrderPageVoList;
@@ -897,6 +991,7 @@
appUserOrderGetVo.setCouponDiscount(order.getCouponMoney());
appUserOrderGetVo.setReceivableDeposit(order.getReceivableDeposit());
appUserOrderGetVo.setReceivableMoney(order.getReceivableMoney());
+ appUserOrderGetVo.setPayType(order.getPayType());
appUserOrderGetVo.setPayMoney(order.getPayMoney());
appUserOrderGetVo.setOrderRemark(order.getOrderRemark());
appUserOrderGetVo.setShopId(order.getShopId());
@@ -1025,6 +1120,10 @@
if (order.getOrderStatus() != 2) {
throw new ServiceException(AppErrorConstant.VERIFY_USED);
}
+ ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyOrderDto.getUserId()).getData();
+ if(!shopRelUserVo.getShopId().equals(order.getShopId())){
+ throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
+ }
order.setOrderStatus(3);
order.setUseTime(nowTime);
order.setUseUserId(merVerifyOrderDto.getUserId());
@@ -1105,6 +1204,10 @@
@Override
public MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto) {
MerVerifyCouponGetVo verifyCouponGetVo = remoteCouponService.getVerifyCoupon(merVerifyCouponDto.getMemberCouponId()).getData();
+ ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyCouponDto.getUserId()).getData();
+ if(!shopRelUserVo.getShopId().equals(verifyCouponGetVo.getMemberCoupon().getShopId())){
+ throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
+ }
// 创建MerVerifyCouponVo对象
MerVerifyCouponVo merVerifyCouponVo = new MerVerifyCouponVo();
// 调用remoteCouponService的getVerifyCoupon方法获取MerVerifyCouponGetVo对象
@@ -1197,6 +1300,10 @@
MemberGiftRecord memberGiftRecord = remoteMemberService.getVerifyPrize(merVerifyPrizeDto.getPrizeId()).getData();
if(memberGiftRecord==null||memberGiftRecord.getVerifyStatus()!=1){
throw new ServiceException(AppErrorConstant.COUPON_USED);
+ }
+ ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyPrizeDto.getUserId()).getData();
+ if(!shopRelUserVo.getShopId().equals(memberGiftRecord.getShopId())){
+ throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
Member member = remoteMemberService.getMember(memberGiftRecord.getUserId()).getData();
merVerifyAwardVo.setUserName(member.getNickName());
@@ -1364,7 +1471,10 @@
BigDecimal goodsRealPrice;
Long shopId = merNewOrderDto.getShopId();
Shop shop = remoteShopService.getShop(shopId).getData();
- List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(userId).getData();
+ MerBaseDto merBaseDto = new MerBaseDto();
+ merBaseDto.setUserId(userId);
+ merBaseDto.setShopId(shopId);
+ List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(merBaseDto).getData();
Map<String, AppMemberCouponVo> appMemberCouponVoMap = new HashMap<>();
if (null != appMemberCouponVoList) {
appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
@@ -1431,8 +1541,10 @@
}
goodsDeposit = goods.getSubscription();
- if (goodsDeposit == null) {
+ if (goodsDeposit == null || goodsDeposit.compareTo(BigDecimal.ZERO)==0) {
goodsDeposit = new BigDecimal("0.00");
+ }else{
+ goodsDeposit = goodsDeposit.multiply(buyNumBig);
}
goodsNum = goodsNum + buyNum;
orderGoodsMoney = orderGoodsMoney.add(goodsTotalPrice);
@@ -1510,6 +1622,7 @@
order.setOnlinePayMoney(new BigDecimal("0.00"));
order.setOfflinePayMoney(merNewOrderDto.getPayMoney());
order.setOffPayTime(nowTime);
+ order.setPayType(1);
order.setCloseFlag(1);
this.save(order);
//创建服务
@@ -3011,6 +3124,8 @@
Boolean haveGoods = false;
// 获取订单中的所有商品
List<OrderGoods> orderGoodsList = orderGoodsService.listByOrderId(orderId);
+ List<GoodsTotalChangeDto> goodsTotalChangeDtoList = new ArrayList<>();
+ GoodsTotalChangeDto goodsTotalChangeDto;
// 遍历订单中的所有商品，根据商品类型累加收款金额，并标记商品存在状态
for (OrderGoods orderGoods : orderGoodsList) {
switch (orderGoods.getGoodsType()) {
@@ -3033,7 +3148,18 @@
default:
break;
}
+ goodsTotalChangeDto = new GoodsTotalChangeDto();
+ goodsTotalChangeDto.setGoodsId(orderGoods.getGoodsId());
+ goodsTotalChangeDto.setChangeType(1);
+ goodsTotalChangeDto.setChangeNum(orderGoods.getBuyNum());
+ goodsTotalChangeDto.setMoney(orderGoods.getGoodsReceivableMoney());
+ Integer bugGoodsNum = orderMapper.countUserBuyGoodsNum(order.getUserId(),orderGoods.getGoodsId());
+ if(bugGoodsNum==null||bugGoodsNum<1){
+ goodsTotalChangeDto.setPersonNum(1);
+ }
+ goodsTotalChangeDtoList.add(goodsTotalChangeDto);
}
+ //更新商品统计
// 更新商户统计信息
ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
shopTotalChangeDto.setShopId(order.getShopId());
@@ -3236,4 +3362,243 @@
remoteActivityService.changeActivityTotal(activityTotalChangeDto);
}
}
+
+ /**
+ * @description 员工端活动订单统计
+ * @author jqs
+ * @date 2023/7/17 15:25
+ * @param staffTotalDto
+ * @return StaffActivityOrderTotalVo
+ */
+ @Override
+ public StaffActivityOrderTotalVo getStaffActivityOrderTotal(StaffTotalDto staffTotalDto){
+ StaffActivityOrderTotalVo staffActivityOrderTotalVo = orderMapper.getStaffActivityOrderTotal(staffTotalDto);
+ return staffActivityOrderTotalVo;
+ }
+
+ /**
+ * @description 员工端活动统计
+ * @author jqs
+ * @date 2023/7/17 15:51
+ * @param staffTotalDto
+ * @return StaffActivityTotalVo
+ */
+ @Override
+ public StaffActivityTotalVo getStaffActivityTotal(StaffTotalDto staffTotalDto){
+ StaffActivityTotalVo staffActivityTotalVo = orderMapper.getStaffActivityTotal(staffTotalDto);
+ return staffActivityTotalVo;
+ }
+
+ /**
+ * @description 员工端活动统计订单分布
+ * @author jqs
+ * @date 2023/7/17 16:16
+ * @param staffTotalDto
+ * @return MerOrderDistributionTotalVo
+ */
+ @Override
+ public MerOrderDistributionTotalVo getStaffOrderDistributionTotal(StaffTotalDto staffTotalDto){
+ MerOrderDistributionTotalVo orderDistributionTotalVo = new MerOrderDistributionTotalVo();
+ // 获取订单年龄用户列表
+ MerTotalDto merTotalDto = new MerTotalDto();
+ merTotalDto.setShopId(staffTotalDto.getShopId());
+ List<MerOrderAgeUserVo> orderAgeUserVoList = remoteMemberService.listOrderAgeUser(merTotalDto).getData();
+ // 如果订单年龄用户列表不为空
+ if (orderAgeUserVoList != null && !orderAgeUserVoList.isEmpty()) {
+ // 定义变量
+ Integer ageType;
+ List<Long> userIdList;
+ MerOrderAgeUserVo orderAgeUserVo;
+ MgtMapTotalPlusVo mgtMapTotalPlusVo;
+ String[] orderTotalKey = new String[5];
+ Integer[] orderTotalValue = new Integer[5];
+ BigDecimal[] orderMoneyValue = new BigDecimal[5];
+ // 遍历订单年龄用户列表
+ for (int i = 0; i < orderAgeUserVoList.size(); i++) {
+ orderAgeUserVo = orderAgeUserVoList.get(i);
+ ageType = orderAgeUserVo.getAgeType();
+ userIdList = orderAgeUserVo.getUserIdList();
+ // 根据年龄类型设置订单总数键
+ switch (ageType) {
+ case 1:
+ orderTotalKey[i] = "<20";
+ break;
+ case 2:
+ orderTotalKey[i] = "21-30";
+ break;
+ case 3:
+ orderTotalKey[i] = "31-40";
+ break;
+ case 4:
+ orderTotalKey[i] = "41-50";
+ break;
+ case 5:
+ orderTotalKey[i] = ">50";
+ break;
+ }
+ // 如果用户ID列表不为空
+ if (userIdList != null && !userIdList.isEmpty()) {
+ mgtMapTotalPlusVo = orderMapper.listStaffActivityOrderDistributionTotal(userIdList,staffTotalDto.getShopId(),staffTotalDto.getActivityId());
+ orderTotalValue[i] = mgtMapTotalPlusVo.getMapValueFirst();
+ orderMoneyValue[i] = mgtMapTotalPlusVo.getMapValueSecond();
+ } else {
+ orderTotalValue[i] = 0;
+ orderMoneyValue[i] = BigDecimal.ZERO;
+ }
+ }
+ // 设置订单分布总数对象的属性值
+ orderDistributionTotalVo.setOrderTotalKey(orderTotalKey);
+ orderDistributionTotalVo.setOrderTotalValue(orderTotalValue);
+ orderDistributionTotalVo.setOrderMoneyValue(orderMoneyValue);
+ }
+ // 返回订单分布总数对象
+ return orderDistributionTotalVo;
+ }
+
+
+ /**
+ * @description 员工端活动统计销售占比
+ * @author jqs
+ * @date 2023/7/17 17:03
+ * @param staffTotalDto
+ * @return MerOrderTypeTotalVo
+ */
+ @Override
+ public MerOrderTypeTotalVo getStaffOrderTypeTotal(StaffTotalDto staffTotalDto){
+ MerOrderTypeTotalVo orderTypeTotalVo = new MerOrderTypeTotalVo();
+ //获取商品分类销售数据
+ List<MgtMapTotalPlusVo> MgtMapIntTotalVoGoodsType = orderMapper.listStaffOrderTotalGoodsType(staffTotalDto);
+ List<MgtMapIntTotalVo> goodsTypeTotalList = new ArrayList<>();
+ List<MgtMapBigTotalVo> goodsTypeMoneyList = new ArrayList<>();
+ if (MgtMapIntTotalVoGoodsType != null && MgtMapIntTotalVoGoodsType.size() > 0) {
+ MgtMapIntTotalVo MgtMapIntTotalVo;
+ MgtMapBigTotalVo mgtMapBigTotalVo;
+ // 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
+ for (int i = 0; i < MgtMapIntTotalVoGoodsType.size(); i++) {
+ MgtMapIntTotalVo = new MgtMapIntTotalVo();
+ mgtMapBigTotalVo = new MgtMapBigTotalVo();
+ MgtMapIntTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+ mgtMapBigTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond());
+ if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("1")) {
+ MgtMapIntTotalVo.setMapKey("周期");
+ mgtMapBigTotalVo.setMapKey("周期");
+ } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("2")) {
+ MgtMapIntTotalVo.setMapKey("服务");
+ mgtMapBigTotalVo.setMapKey("服务");
+ } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("3")) {
+ MgtMapIntTotalVo.setMapKey("体验");
+ mgtMapBigTotalVo.setMapKey("体验");
+ } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("4")) {
+ MgtMapIntTotalVo.setMapKey("单品");
+ mgtMapBigTotalVo.setMapKey("单品");
+ }
+ goodsTypeTotalList.add(MgtMapIntTotalVo);
+ goodsTypeMoneyList.add(mgtMapBigTotalVo);
+ }
+ orderTypeTotalVo.setGoodsTypeTotalList(goodsTypeTotalList);
+ orderTypeTotalVo.setGoodsTypeMoneyList(goodsTypeMoneyList);
+ }
+ return orderTypeTotalVo;
+ }
+
+ /**
+ * @description 员工端获客人数
+ * @author jqs
+ * @date 2023/7/17 18:42
+ * @param staffTotalDto
+ * @return StaffActivityDateMemberTotalVo
+ */
+ @Override
+ public StaffActivityDateMemberTotalVo getStaffActivityGetMemberTotal(StaffTotalDto staffTotalDto) {
+ // 创建返回对象
+ StaffActivityDateMemberTotalVo staffActivityDateMemberTotalVo = new StaffActivityDateMemberTotalVo();
+ // 查询数据库获取数据
+ List<MgtMapIntTotalVo> mgtMapIntTotalVoList = orderMapper.getStaffActivityGetMemberTotal(staffTotalDto);
+ // 将查询结果转为Map
+ Map<String, Integer> map = new HashMap<>();
+ if (mgtMapIntTotalVoList != null && !mgtMapIntTotalVoList.isEmpty()) {
+ map = mgtMapIntTotalVoList.stream()
+ .collect(Collectors.toMap(MgtMapIntTotalVo::getMapKey, MgtMapIntTotalVo::getMapValue));
+ }
+ // 获取日期范围
+ List<String> dateList = getDateRange(staffTotalDto.getStartDate(), staffTotalDto.getEndDate());
+ int size = dateList.size();
+ // 创建日期和成员总数的数组
+ String[] dateMemberTotalKey = new String[size];
+ Integer[] dateMemberTotalValue = new Integer[size];
+ // 遍历日期列表，设置日期和成员总数的数组
+ String str;
+ Integer value;
+ for (int i = 0; i < size; i++) {
+ str = dateList.get(i);
+ dateMemberTotalKey[i] = str;
+ value = map.get(str);
+ dateMemberTotalValue[i] = (value != null) ? value : 0;
+ }
+ // 设置返回对象的日期和成员总数数组
+ staffActivityDateMemberTotalVo.setDateMemberTotalKey(dateMemberTotalKey);
+ staffActivityDateMemberTotalVo.setDateMemberTotalValue(dateMemberTotalValue);
+ // 返回结果对象
+ return staffActivityDateMemberTotalVo;
+ }
+
+ /**
+ * @description 员工端获客人数
+ * @author jqs
+ * @date 2023/7/17 18:42
+ * @param staffTotalDto
+ * @return StaffActivityDateMemberTotalVo
+ */
+ @Override
+ public StaffActivityDateMemberTotalVo getStaffActivityMemberTotal(StaffTotalDto staffTotalDto) {
+ // 创建返回对象
+ StaffActivityDateMemberTotalVo staffActivityDateMemberTotalVo = new StaffActivityDateMemberTotalVo();
+ // 查询数据库获取数据
+ List<MgtMapIntTotalVo> mgtMapIntTotalVoList = orderMapper.getStaffActivityMemberTotal(staffTotalDto);
+ // 将查询结果转为Map
+ Map<String, Integer> map = new HashMap<>();
+ if (mgtMapIntTotalVoList != null && !mgtMapIntTotalVoList.isEmpty()) {
+ map = mgtMapIntTotalVoList.stream()
+ .collect(Collectors.toMap(MgtMapIntTotalVo::getMapKey, MgtMapIntTotalVo::getMapValue));
+ }
+ // 获取日期范围
+ List<String> dateList = getDateRange(staffTotalDto.getStartDate(), staffTotalDto.getEndDate());
+ int size = dateList.size();
+ // 创建日期和成员总数的数组
+ String[] dateMemberTotalKey = new String[size];
+ Integer[] dateMemberTotalValue = new Integer[size];
+ // 遍历日期列表，设置日期和成员总数的数组
+ String str;
+ Integer value;
+ for (int i = 0; i < size; i++) {
+ str = dateList.get(i);
+ dateMemberTotalKey[i] = str;
+ value = map.get(str);
+ dateMemberTotalValue[i] = (value != null) ? value : 0;
+ }
+ // 设置返回对象的日期和成员总数数组
+ staffActivityDateMemberTotalVo.setDateMemberTotalKey(dateMemberTotalKey);
+ staffActivityDateMemberTotalVo.setDateMemberTotalValue(dateMemberTotalValue);
+ // 返回结果对象
+ return staffActivityDateMemberTotalVo;
+ }
+
+ /**
+ * @description 获取时间段日期
+ * @author jqs
+ * @date 2023/7/17 19:11
+ * @param startDate
+ * @param endDate
+ * @return List<String>
+ */
+ public static List<String> getDateRange(String startDate, String endDate) {
+ List<String> dateList = new ArrayList<>();
+ LocalDate start = LocalDate.parse(startDate);
+ LocalDate end = LocalDate.parse(endDate);
+ while (!start.isAfter(end)) {
+ dateList.add(start.format(DateTimeFormatter.ISO_DATE));
+ start = start.plusDays(1);
+ }
+ return dateList;
+ }
}
--
Gitblit v1.7.1