From c7ac989e5a693bf29efb4fbaee16770442ea41a0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 七月 2025 16:15:14 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 343 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 249 insertions(+), 94 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 defa9b3..6710cea 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
@@ -35,6 +35,7 @@
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.CodeFactoryUtil;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.goods.api.domain.GetLotteryEventList;
import com.ruoyi.goods.api.domain.TLotteryEvent;
import com.ruoyi.goods.api.service.LotteryEventClient;
import com.ruoyi.order.config.WxPayConfiguration;
@@ -89,10 +90,12 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.MathContext;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -401,6 +404,20 @@
appSureOrderVo.setOrderPayMoney(orderPayMoney);
// 设置订单商品列表
appSureOrderVo.setAppSureOrderGoodsVoList(appSureOrderGoodsVoList);
+ appSureOrderVo.setLotteryDraw(false);
+ // 返回AppPlaceOrderVo对象
+ GetLotteryEventList getLotteryEventList = new GetLotteryEventList();
+ getLotteryEventList.setActivityType(2);
+ getLotteryEventList.setUserId(SecurityUtils.getUserId());
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(getLotteryEventList).getData();
+ if (data.size() > 0) {
+ BigDecimal finalOrderPayMoney = orderPayMoney;
+ List<TLotteryEvent> collect = data.stream().filter(s -> s.getPayMoney().compareTo(finalOrderPayMoney) <= 0).collect(Collectors.toList());
+ if (collect.size() > 0) {
+ appSureOrderVo.setLotteryDraw(true);
+ appSureOrderVo.setLotteryEventId(collect.get(0).getId());
+ }
+ }
return appSureOrderVo;
}
@@ -509,6 +526,20 @@
appPanicBuyVo.setOrderGoodsMoney(orderGoodsMoney);
appPanicBuyVo.setOrderPayDeposit(orderPayDeposit);
appPanicBuyVo.setOrderPayMoney(orderPayMoney);
+ appPanicBuyVo.setLotteryDraw(false);
+ // 返回AppPlaceOrderVo对象
+ GetLotteryEventList getLotteryEventList = new GetLotteryEventList();
+ getLotteryEventList.setActivityType(2);
+ getLotteryEventList.setUserId(SecurityUtils.getUserId());
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(getLotteryEventList).getData();
+ if (data.size() > 0) {
+ BigDecimal finalOrderPayMoney = orderPayMoney;
+ List<TLotteryEvent> collect = data.stream().filter(s -> s.getPayMoney().compareTo(finalOrderPayMoney) <= 0).collect(Collectors.toList());
+ if (collect.size() > 0) {
+ appPanicBuyVo.setLotteryDraw(true);
+ appPanicBuyVo.setLotteryEventId(collect.get(0).getId());
+ }
+ }
return appPanicBuyVo;
}
@@ -840,6 +871,21 @@
appMemberGoodsTypeDto.setUserId(userId);
appMemberGoodsTypeDto.setGoodsTypeSet(goodsTypeSet);
remoteMemberService.updateMemberGoodsType(appMemberGoodsTypeDto);
+ }
+
+ appPlaceOrderVo.setLotteryDraw(false);
+ // 返回AppPlaceOrderVo对象
+ GetLotteryEventList getLotteryEventList = new GetLotteryEventList();
+ getLotteryEventList.setActivityType(2);
+ getLotteryEventList.setUserId(SecurityUtils.getUserId());
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(getLotteryEventList).getData();
+ if (data.size() > 0) {
+ BigDecimal finalOrderPayMoney = orderPayMoney;
+ List<TLotteryEvent> collect = data.stream().filter(s -> s.getPayMoney().compareTo(finalOrderPayMoney) <= 0).collect(Collectors.toList());
+ if (collect.size() > 0) {
+ appPlaceOrderVo.setLotteryDraw(true);
+ appPlaceOrderVo.setLotteryEventId(collect.get(0).getId());
+ }
}
return appPlaceOrderVo;
}
@@ -1323,6 +1369,20 @@
remoteActivityService.addActivityRecord(activityRecord);
//扣除redis库存
redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + activityId + "-" + goodsId, surpNum - buyNum);
+ appPlaceOrderVo.setLotteryDraw(false);
+ // 返回AppPlaceOrderVo对象
+ GetLotteryEventList getLotteryEventList = new GetLotteryEventList();
+ getLotteryEventList.setActivityType(2);
+ getLotteryEventList.setUserId(SecurityUtils.getUserId());
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(getLotteryEventList).getData();
+ if (data.size() > 0) {
+ BigDecimal finalOrderPayMoney = orderPayMoney;
+ List<TLotteryEvent> collect = data.stream().filter(s -> s.getPayMoney().compareTo(finalOrderPayMoney) <= 0).collect(Collectors.toList());
+ if (collect.size() > 0) {
+ appPlaceOrderVo.setLotteryDraw(true);
+ appPlaceOrderVo.setLotteryEventId(collect.get(0).getId());
+ }
+ }
} catch (Exception e){
log.error("活动订单购买失败:"+e.getMessage());
throw new ServiceException(e.getMessage());
@@ -1600,16 +1660,18 @@
appPlaceOrderVo.setSignType(payArr[4]);
appPlaceOrderVo.setPaySign(payArr[5]);
appPlaceOrderVo.setPrepayId(orderPayment.getPrepayId());
+ appPlaceOrderVo.setLotteryDraw(false);
// 返回AppPlaceOrderVo对象
- List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(2).getData();
+ GetLotteryEventList getLotteryEventList = new GetLotteryEventList();
+ getLotteryEventList.setActivityType(2);
+ getLotteryEventList.setUserId(SecurityUtils.getUserId());
+ List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(getLotteryEventList).getData();
if (data.size() > 0) {
- List<TLotteryEvent> collect = data.stream().filter(s -> s.getPayMoney().compareTo(order.getPayMoney()) >= 0).collect(Collectors.toList());
- appPlaceOrderVo.setLotteryDraw(collect.size() > 0);
+ List<TLotteryEvent> collect = data.stream().filter(s -> s.getPayMoney().compareTo(order.getPayMoney()) <= 0).collect(Collectors.toList());
if (collect.size() > 0) {
+ appPlaceOrderVo.setLotteryDraw(true);
appPlaceOrderVo.setLotteryEventId(collect.get(0).getId());
}
- } else {
- appPlaceOrderVo.setLotteryDraw(false);
}
return appPlaceOrderVo;
}
@@ -1846,6 +1908,12 @@
merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
}
}
+ if(null == merVerifyOrderVo.getRealReceiveMoney()){
+ merVerifyOrderVo.setRealReceiveMoney(BigDecimal.ZERO);
+ }
+ if(null == merVerifyOrderVo.getReceiveMoney()){
+ merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
+ }
merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(merVerifyOrderVo.getReceiveMoney()));
merVerifyOrderVo.setUserId(order.getUserId());
merVerifyOrderVo.setUserName(member.getRealName());
@@ -1952,9 +2020,9 @@
}
Member member = remoteMemberService.getMember(order.getUserId()).getData();
//获取核销商户
- ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyOrderDto.getUserId()).getData();
- Long shopId = shopRelUserVo.getShopId();
- log.info("当前核销员工【" + shopRelUserVo.getUserName() + "】门店ID：" + shopId);
+// ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyOrderDto.getUserId()).getData();
+ Long shopId = member.getRelationShopId();
+// log.info("当前核销员工【" + shopRelUserVo.getUserName() + "】门店ID：" + shopId);
//获取订单商品列表
List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listAppVoByOrderId(orderId);
//绑定用户判断核销商户
@@ -2020,38 +2088,13 @@
ConsumerGoods consumerGoods;
String consumerGoodsId;
Goods goods;
- //循环生成商品服务
- List<ConsumerGoods> consumerGoodsList = new ArrayList<>();
- for (AppUserOrderGoodsPageVo appUserOrderGoodsPageVo : appUserOrderGoodsPageVoList) {
- Integer buyNum = appUserOrderGoodsPageVo.getBuyNum();
- //判断是否次数未确认商品 是则创建未确认周期商品服务 否则循环创建商品服务
- if (appUserOrderGoodsPageVo.getCycleNumFlag() == 0) {
- consumerGoods = new ConsumerGoods();
- goods = goodsMap.get(appUserOrderGoodsPageVo.getGoodsId());
- consumerGoodsId = IdUtils.simpleUUID();
- consumerGoods.setConsumerGoodsId(consumerGoodsId);
- consumerGoods.setDelFlag(0);
- consumerGoods.setServiceStatus(1);
- consumerGoods.setShopId(order.getShopId());
- consumerGoods.setUserId(order.getUserId());
- consumerGoods.setOrderId(orderId);
- consumerGoods.setOrderGoodsId(appUserOrderGoodsPageVo.getOrderGoodsId());
- consumerGoods.setGoodsId(appUserOrderGoodsPageVo.getGoodsId());
- consumerGoods.setGoodsName(appUserOrderGoodsPageVo.getGoodsName());
- consumerGoods.setCycleNumFlag(appUserOrderGoodsPageVo.getCycleNumFlag());
- consumerGoods.setServiceNum(appUserOrderGoodsPageVo.getServiceNum());
- consumerGoods.setUsedNum(0);
- consumerGoods.setGoodsType(appUserOrderGoodsPageVo.getGoodsType());
- consumerGoods.setGoodsTag(appUserOrderGoodsPageVo.getGoodsTag());
- consumerGoods.setCreateTime(nowTime);
- consumerGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
- consumerGoods.setGoodsPicture(appUserOrderGoodsPageVo.getGoodsPicture());
- consumerGoods.setGoodsNurses(goods.getGoodsNurses());
- consumerGoods.setSourceFrom(1);
- consumerGoods.setSureNum(buyNum);
- consumerGoodsList.add(consumerGoods);
- } else {
- for (int i = 0; i < buyNum; i++) {
+ if(null != appUserOrderGoodsPageVoList.get(0).getGoodsId()){
+ //循环生成商品服务
+ List<ConsumerGoods> consumerGoodsList = new ArrayList<>();
+ for (AppUserOrderGoodsPageVo appUserOrderGoodsPageVo : appUserOrderGoodsPageVoList) {
+ Integer buyNum = appUserOrderGoodsPageVo.getBuyNum();
+ //判断是否次数未确认商品 是则创建未确认周期商品服务 否则循环创建商品服务
+ if (appUserOrderGoodsPageVo.getCycleNumFlag() == 0) {
consumerGoods = new ConsumerGoods();
goods = goodsMap.get(appUserOrderGoodsPageVo.getGoodsId());
consumerGoodsId = IdUtils.simpleUUID();
@@ -2074,11 +2117,38 @@
consumerGoods.setGoodsPicture(appUserOrderGoodsPageVo.getGoodsPicture());
consumerGoods.setGoodsNurses(goods.getGoodsNurses());
consumerGoods.setSourceFrom(1);
+ consumerGoods.setSureNum(buyNum);
consumerGoodsList.add(consumerGoods);
+ } else {
+ for (int i = 0; i < buyNum; i++) {
+ consumerGoods = new ConsumerGoods();
+ goods = goodsMap.get(appUserOrderGoodsPageVo.getGoodsId());
+ consumerGoodsId = IdUtils.simpleUUID();
+ consumerGoods.setConsumerGoodsId(consumerGoodsId);
+ consumerGoods.setDelFlag(0);
+ consumerGoods.setServiceStatus(1);
+ consumerGoods.setShopId(order.getShopId());
+ consumerGoods.setUserId(order.getUserId());
+ consumerGoods.setOrderId(orderId);
+ consumerGoods.setOrderGoodsId(appUserOrderGoodsPageVo.getOrderGoodsId());
+ consumerGoods.setGoodsId(appUserOrderGoodsPageVo.getGoodsId());
+ consumerGoods.setGoodsName(appUserOrderGoodsPageVo.getGoodsName());
+ consumerGoods.setCycleNumFlag(appUserOrderGoodsPageVo.getCycleNumFlag());
+ consumerGoods.setServiceNum(appUserOrderGoodsPageVo.getServiceNum());
+ consumerGoods.setUsedNum(0);
+ consumerGoods.setGoodsType(appUserOrderGoodsPageVo.getGoodsType());
+ consumerGoods.setGoodsTag(appUserOrderGoodsPageVo.getGoodsTag());
+ consumerGoods.setCreateTime(nowTime);
+ consumerGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
+ consumerGoods.setGoodsPicture(appUserOrderGoodsPageVo.getGoodsPicture());
+ consumerGoods.setGoodsNurses(goods.getGoodsNurses());
+ consumerGoods.setSourceFrom(1);
+ consumerGoodsList.add(consumerGoods);
+ }
}
}
+ consumerGoodsService.saveBatchConsumerGoods(consumerGoodsList);
}
- consumerGoodsService.saveBatchConsumerGoods(consumerGoodsList);
//生成返回
MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
merVerifyOrderVo.setOrderId(orderId);
@@ -2131,25 +2201,27 @@
order.setNewMemberFlag(0);
}
this.saveOrUpdate(order);
- // 订单金额大于0时进行分账
- OrderPayment orderPayment = orderPaymentService.getOne(new QueryWrapper<OrderPayment>()
- .eq("order_id", order.getOrderId()).eq("pay_status", 2)
- .eq("del_flag", 0));
- BigDecimal bigDecimal = orderPayment.getPayMoney().subtract(orderPayment.getFeeAmount()).setScale(2, BigDecimal.ROUND_HALF_EVEN);
- if (bigDecimal.compareTo(BigDecimal.ZERO)>0) {
- // TODO: 2023/10/17 更换分账渠道（汇付天下）
+ if(4 != order.getOrderFrom()){
+ // 订单金额大于0时进行分账
+ OrderPayment orderPayment = orderPaymentService.getOne(new QueryWrapper<OrderPayment>()
+ .eq("order_id", order.getOrderId()).eq("pay_status", 2)
+ .eq("del_flag", 0));
+ BigDecimal bigDecimal = orderPayment.getPayMoney().subtract(orderPayment.getFeeAmount()).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ if (bigDecimal.compareTo(BigDecimal.ZERO)>0) {
+ // TODO: 2023/10/17 更换分账渠道（汇付天下）
// submitProfitSharing(orderId, order.getOrderNo(), order.getShopId(), order.getOnlinePayMoney(),order.getOrderFrom());
- submitProfitSharing1(orderId, order.getOrderNo(), order.getShopId(), bigDecimal, order.getOrderFrom());
- }
- //创建支付记录
- if(merVerifyOrderDto.getRelPayMoney().compareTo(BigDecimal.ZERO)>0){
- PayRecord payRecord = new PayRecord();
- payRecord.setDelFlag(0);
- payRecord.setOrderId(order.getOrderId());
- payRecord.setPayMoney(merVerifyOrderDto.getRelPayMoney());
- payRecord.setPayTime(new Date());
- payRecord.setPayType(merVerifyOrderDto.getPayType());
- payRecordService.save(payRecord);
+ submitProfitSharing1(orderId, order.getOrderNo(), order.getShopId(), bigDecimal, order.getOrderFrom());
+ }
+ //创建支付记录
+ if(merVerifyOrderDto.getRelPayMoney().compareTo(BigDecimal.ZERO)>0){
+ PayRecord payRecord = new PayRecord();
+ payRecord.setDelFlag(0);
+ payRecord.setOrderId(order.getOrderId());
+ payRecord.setPayMoney(merVerifyOrderDto.getRelPayMoney());
+ payRecord.setPayTime(new Date());
+ payRecord.setPayType(merVerifyOrderDto.getPayType());
+ payRecordService.save(payRecord);
+ }
}
//更新用户积分和消费统计
MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
@@ -2285,13 +2357,18 @@
orderGoods.setOrderGoodsId(IdUtils.simpleUUID());
orderGoods.setDelFlag(0);
orderGoods.setOrderId(order.getOrderId());
+ orderGoods.setGoodsPrice(originAmount);
+ orderGoods.setGoodsTotalMoney(originAmount);
+ orderGoods.setGoodsReceivableMoney(originAmount);
+ orderGoods.setBuyNum(1);
ConsumerGoods consumerGoods = new ConsumerGoods();
+ consumerGoods.setUsedNum(1);
if(null != timeCard){
- orderGoods.setBuyNum(timeCard.getTimesCount());
- orderGoods.setServiceNum(timeCard.getTimesCount());
+ //核销一次加一次
+ orderGoods.setBuyNum(1);
+ orderGoods.setServiceNum(1);
consumerGoods.setServiceNum(timeCard.getTimesCount());
- consumerGoods.setUsedNum(1);
consumerGoods.setUseTime(new Date());
}
orderGoods.setCycleNumFlag(1);
@@ -2304,7 +2381,7 @@
consumerGoods.setServiceStatus(1);
consumerGoods.setShopId(order.getShopId());
consumerGoods.setUserId(order.getUserId());
- consumerGoods.setOrderId(orderId);
+ consumerGoods.setOrderId(order.getOrderId());
consumerGoods.setOrderGoodsId(orderGoods.getOrderGoodsId());
consumerGoods.setGoodsName(sku.getTitle());
consumerGoods.setCycleNumFlag(1);
@@ -2315,7 +2392,7 @@
//生成返回
MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
- merVerifyOrderVo.setOrderId(orderId);
+ merVerifyOrderVo.setOrderId(order.getOrderId());
merVerifyOrderVo.setOrderNo(order.getOrderNo());
merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
merVerifyOrderVo.setOrderFrom(order.getOrderFrom());
@@ -2384,7 +2461,7 @@
if (integral > 0) {
memberTotalChangeDto.setChangeIntegral(integral);
memberTotalChangeDto.setTypeIntegral(1);
- memberTotalChangeDto.setOrderId(orderId);
+ memberTotalChangeDto.setOrderId(order.getOrderId());
memberTotalChangeDto.setOrderNo(order.getOrderNo());
}
}
@@ -2395,6 +2472,12 @@
}else{
//扣减剩余次数
OrderGoods orderGoods = orderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderId, order.getOrderId()));
+ //核销一次加一次数量
+ orderGoods.setBuyNum(orderGoods.getBuyNum() + 1);
+ if(null != orderGoods.getServiceNum()){
+ orderGoods.setServiceNum(orderGoods.getServiceNum() + 1);
+ }
+ orderGoodsService.updateById(orderGoods);
ConsumerGoods consumerGoods = consumerGoodsService.getOne(new LambdaQueryWrapper<ConsumerGoods>().eq(ConsumerGoods::getOrderId, order.getOrderId()).eq(ConsumerGoods::getOrderGoodsId, orderGoods.getOrderGoodsId()));
consumerGoods.setUsedNum(consumerGoods.getUsedNum() + 1);
consumerGoods.setUseTime(new Date());
@@ -2404,7 +2487,7 @@
consumerGoodsService.updateById(consumerGoods);
//生成返回
MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
- merVerifyOrderVo.setOrderId(orderId);
+ merVerifyOrderVo.setOrderId(order.getOrderId());
merVerifyOrderVo.setOrderNo(order.getOrderNo());
merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
merVerifyOrderVo.setOrderFrom(order.getOrderFrom());
@@ -2554,7 +2637,11 @@
orderGoods.setDelFlag(0);
orderGoods.setOrderId(order.getOrderId());
orderGoods.setGoodsId(sku.getSku_id());
- orderGoods.setBuyNum(sku.getTimes_count());
+ orderGoods.setBuyNum(1);
+ orderGoods.setServiceNum(1);
+ orderGoods.setGoodsPrice(originAmount);
+ orderGoods.setGoodsTotalMoney(originAmount);
+ orderGoods.setGoodsReceivableMoney(originAmount);
orderGoods.setCycleNumFlag(1);
orderGoods.setServiceNum(sku.getTimes_count());
orderGoods.setGoodsType(2);
@@ -2567,7 +2654,7 @@
consumerGoods.setServiceStatus(1);
consumerGoods.setShopId(order.getShopId());
consumerGoods.setUserId(order.getUserId());
- consumerGoods.setOrderId(orderId);
+ consumerGoods.setOrderId(order.getOrderId());
consumerGoods.setGoodsId(sku.getSku_id());
consumerGoods.setOrderGoodsId(orderGoods.getOrderGoodsId());
consumerGoods.setGoodsName(sku.getTitle());
@@ -2581,7 +2668,7 @@
consumerGoodsService.save(consumerGoods);
//生成返回
MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
- merVerifyOrderVo.setOrderId(orderId);
+ merVerifyOrderVo.setOrderId(order.getOrderId());
merVerifyOrderVo.setOrderNo(order.getOrderNo());
merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
merVerifyOrderVo.setOrderFrom(order.getOrderFrom());
@@ -2650,7 +2737,7 @@
if (integral > 0) {
memberTotalChangeDto.setChangeIntegral(integral);
memberTotalChangeDto.setTypeIntegral(1);
- memberTotalChangeDto.setOrderId(orderId);
+ memberTotalChangeDto.setOrderId(order.getOrderId());
memberTotalChangeDto.setOrderNo(order.getOrderNo());
}
}
@@ -2661,6 +2748,10 @@
}else{
//扣减剩余次数
OrderGoods orderGoods = orderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderId, order.getOrderId()));
+ orderGoods.setBuyNum(orderGoods.getBuyNum() + 1);
+ orderGoods.setServiceNum(orderGoods.getServiceNum() + 1);
+ orderGoodsService.updateById(orderGoods);
+
ConsumerGoods consumerGoods = consumerGoodsService.getOne(new LambdaQueryWrapper<ConsumerGoods>().eq(ConsumerGoods::getOrderId, order.getOrderId()).eq(ConsumerGoods::getOrderGoodsId, orderGoods.getOrderGoodsId()));
consumerGoods.setUsedNum(consumerGoods.getUsedNum() + 1);
consumerGoods.setUseTime(new Date());
@@ -2670,7 +2761,7 @@
consumerGoodsService.updateById(consumerGoods);
//生成返回
MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
- merVerifyOrderVo.setOrderId(orderId);
+ merVerifyOrderVo.setOrderId(order.getOrderId());
merVerifyOrderVo.setOrderNo(order.getOrderNo());
merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
merVerifyOrderVo.setOrderFrom(order.getOrderFrom());
@@ -3166,7 +3257,13 @@
consumerGoodsService.sendGoodsGift(giftSendDtoList);
//抽奖奖品中的平台商品需要生成订单数据
if (memberGiftRecord.getPrizeFrom() == 2) {
- addOrder(memberGiftRecord.getShopId(), memberGiftRecord.getUserId(), goods, memberGiftRecord.getGoodsNumber(), memberGiftRecord.getGiftId());
+ Order one = this.getOne(new QueryWrapper<Order>().eq("activity_id", memberGiftRecord.getGiftId()).eq("order_from", 4));
+ if(null == one){
+ addOrder(memberGiftRecord.getShopId(), memberGiftRecord.getUserId(), goods, null, memberGiftRecord.getGoodsNumber(), memberGiftRecord.getGiftId(), 3);
+ }else{
+ one.setOrderStatus(3);
+ this.updateById(one);
+ }
}
break;
case 3:
@@ -3204,23 +3301,23 @@
/**
- * 核销抽奖的平台商品生成订单
+ * 抽奖的平台商品生成订单--待审核
*
* @param shopId
* @param userId
* @param goods
* @param goodsNum
*/
- public void addOrder(Long shopId, Long userId, Goods goods, Integer goodsNum, String giftId) {
+ public void addOrder(Long shopId, Long userId, Goods goods, String goodsName, Integer goodsNum, String giftId, Integer status) {
Order order = new Order();
order.setOrderId(IdUtils.simpleUUID());
order.setDelFlag(0);
- order.setOrderStatus(3);
+ order.setOrderStatus(status);
order.setOrderNo(CodeFactoryUtil.getShopOrderNo());
order.setOrderFrom(4);
order.setShopId(shopId);
order.setUserId(userId);
- order.setOrderMoney(BigDecimal.ZERO);
+ order.setOrderMoney(null == goods ? BigDecimal.ZERO : goods.getSalesPrice());
order.setCouponMoney(BigDecimal.ZERO);
order.setDiscountMoney(BigDecimal.ZERO);
order.setReceivableMoney(BigDecimal.ZERO);
@@ -3240,22 +3337,30 @@
orderGoods.setOrderGoodsId(IdUtils.simpleUUID());
orderGoods.setDelFlag(0);
orderGoods.setOrderId(order.getOrderId());
- orderGoods.setGoodsId(goods.getGoodsId());
orderGoods.setBuyNum(goodsNum);
- orderGoods.setGoodsPrice(goods.getSalesPrice());
- orderGoods.setGoodsDeposit(goods.getSubscription());
- orderGoods.setGoodsTotalMoney(goods.getSalesPrice().multiply(new BigDecimal(goodsNum)));
- orderGoods.setGoodsReceivableMoney(BigDecimal.ZERO);
- orderGoods.setCycleNumFlag(goods.getCycleNumFlag());
- orderGoods.setServiceNum(goods.getServiceNum());
- orderGoods.setGoodsType(goods.getGoodsType());
- orderGoods.setGoodsName(goods.getGoodsName());
- GoodsFile goodsFile = remoteGoodsService.getGoodsFile(goods.getGoodsId()).getData();
- if (null != goodsFile) {
- orderGoods.setGoodsPicture(goodsFile.getFileUrl());
+ if(null != goods){
+ orderGoods.setGoodsId(goods.getGoodsId());
+ orderGoods.setGoodsPrice(goods.getSalesPrice());
+ orderGoods.setGoodsDeposit(goods.getSubscription());
+ orderGoods.setGoodsTotalMoney(goods.getSalesPrice().multiply(new BigDecimal(goodsNum)));
+ orderGoods.setGoodsReceivableMoney(BigDecimal.ZERO);
+ orderGoods.setCycleNumFlag(goods.getCycleNumFlag());
+ orderGoods.setServiceNum(goods.getServiceNum());
+ orderGoods.setGoodsType(goods.getGoodsType());
+ orderGoods.setGoodsName(goods.getGoodsName());
+ GoodsFile goodsFile = remoteGoodsService.getGoodsFile(goods.getGoodsId()).getData();
+ if (null != goodsFile) {
+ orderGoods.setGoodsPicture(goodsFile.getFileUrl());
+ }
+ orderGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
+ orderGoods.setGoodsTag(goods.getGoodsTags());
+ }else{
+ orderGoods.setGoodsName(goodsName);
+ orderGoods.setBuyNum(1);
+ orderGoods.setGoodsPrice(BigDecimal.ZERO);
+ orderGoods.setGoodsTotalMoney(BigDecimal.ZERO);
+ orderGoods.setGoodsReceivableMoney(BigDecimal.ZERO);
}
- orderGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
- orderGoods.setGoodsTag(goods.getGoodsTags());
orderGoodsService.save(orderGoods);
}
@@ -3279,6 +3384,17 @@
if (merMemberNoClearOrderVo.getUnPaidMoney().compareTo(zeroBig) < 0) {
merMemberNoClearOrderVo.setUnPaidMoney(zeroBig);
}
+ String orderId = merMemberNoClearOrderVo.getOrderId();
+ List<OrderGoods> list = orderGoodsService.list(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderId, orderId));
+ List<AppGoodsInfoVo> goodsInfoVos = new ArrayList<>();
+ for (OrderGoods orderGoods : list) {
+ AppGoodsInfoVo info = new AppGoodsInfoVo();
+ info.setGoodsName(orderGoods.getGoodsName());
+ info.setSalesNum(orderGoods.getBuyNum());
+ info.setGoodsType(orderGoods.getGoodsType());
+ goodsInfoVos.add(info);
+ }
+ merMemberNoClearOrderVo.setGoodsList(goodsInfoVos);
}
}
return merMemberNoClearOrderVoList;
@@ -3955,6 +4071,8 @@
MgtOrderTotal mgtOrderTotalFirst = orderMapper.totalOrderFirst(mgtShopOrderPageDto);
MgtOrderTotal mgtOrderTotalSecond = orderMapper.totalOrderSecond(mgtShopOrderPageDto);
MgtOrderTotal mgtOrderTotalThird = orderMapper.totalOrderThird(mgtShopOrderPageDto);
+ MgtOrderTotal mgtOrderTotalFour = orderMapper.totalOrderFour(mgtShopOrderPageDto);
+
mgtOrderTotal.setOrderTotal(mgtOrderTotalFirst.getOrderTotal());
mgtOrderTotal.setOrderMoneyTotal(mgtOrderTotalFirst.getOrderMoneyTotal());
mgtOrderTotal.setShopOrderTotal(mgtOrderTotalSecond.getShopOrderTotal());
@@ -3965,6 +4083,12 @@
mgtOrderTotal.setActivityOrderMoneyTotal(mgtOrderTotalThird.getActivityOrderMoneyTotal());
mgtOrderTotal.setActivityPayMoneyTotal(mgtOrderTotalThird.getActivityPayMoneyTotal());
mgtOrderTotal.setActivityUnPayMoneyTotal(mgtOrderTotalThird.getActivityOrderMoneyTotal().subtract(mgtOrderTotalThird.getActivityPayMoneyTotal()));
+
+ mgtOrderTotal.setThirdOrderTotal(mgtOrderTotalFour.getThirdOrderTotal());
+ mgtOrderTotal.setThirdOrderMoneyTotal(mgtOrderTotalFour.getThirdOrderMoneyTotal());
+ mgtOrderTotal.setThirdPayMoneyTotal(mgtOrderTotalFour.getThirdPayMoneyTotal());
+ mgtOrderTotal.setThirdUnPayMoneyTotal(mgtOrderTotalFour.getThirdOrderMoneyTotal().subtract(mgtOrderTotalFour.getThirdPayMoneyTotal()));
+
return mgtOrderTotal;
}
@@ -4030,7 +4154,7 @@
Map<Long, MgtSimpleShopVo> shopMap = null;
Map<Long, MgtSimpleMemberVo> userMap = null;
if (shopIdSet != null && !shopIdSet.isEmpty()) {
- String shopJoinedString = String.join(",", shopIdSet.stream().map(Object::toString).collect(Collectors.toList()));
+ String shopJoinedString = String.join(",", shopIdSet.stream().filter(Objects::nonNull).map(Object::toString).collect(Collectors.toList()));
MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto();
mgtBaseBathDto.setIds(shopJoinedString);
List<MgtSimpleShopVo> simpleShopVoList = remoteShopService.listShopSimpleVoByIds(mgtBaseBathDto).getData();
@@ -4351,7 +4475,7 @@
*/
private List<MgtMapBigTotalVo> bigListRemoveNull(List<MgtMapBigTotalVo> MgtMapIntTotalVos) {
for (int i = 0; i < MgtMapIntTotalVos.size(); i++) {
- if (StringUtils.isBlank(MgtMapIntTotalVos.get(i).getMapKey())) {
+ if(null == MgtMapIntTotalVos.get(i).getMapKey() || MgtMapIntTotalVos.get(i).getMapKey().isEmpty()){
MgtMapIntTotalVos.remove(i);
}
}
@@ -4940,8 +5064,33 @@
//获取来源销售排名
List<MgtMapBigTotalVo> orderFromList = orderMapper.listPlTotalOrderTotalOrderFrom(mgtBasePlatformDto);
if (orderFromList != null && orderFromList.size() > 0) {
+
+ MgtMapBigTotalVo duoyin = new MgtMapBigTotalVo();
+ duoyin.setMapKey("抖音");
+ duoyin.setMapValue(totalOrderTotalVo.getDouyinAmount());
+
+ MgtMapBigTotalVo kauishou = new MgtMapBigTotalVo();
+ kauishou.setMapKey("快手");
+ kauishou.setMapValue(totalOrderTotalVo.getKuaishouAmount());
+
+ MgtMapBigTotalVo meituan = new MgtMapBigTotalVo();
+ meituan.setMapKey("美团");
+ meituan.setMapValue(totalOrderTotalVo.getMeituanAmount());
+ orderFromList.add(duoyin);
+ orderFromList.add(kauishou);
+ orderFromList.add(meituan);
orderFromList = bigListRemoveNull(orderFromList);
- mgtTotalOrderTotalVo.setOrderFromRankList(orderFromList);
+
+
+ //排行
+ List<MgtMapBigTotalVo> sortedList = orderFromList.stream()
+ // 按 mapValue 降序排序，处理 null 值（若 mapValue 可能为 null）
+ .sorted(Comparator.comparing(
+ MgtMapBigTotalVo::getMapValue,
+ Comparator.nullsLast(BigDecimal::compareTo).reversed()
+ ))
+ .collect(Collectors.toList());
+ mgtTotalOrderTotalVo.setOrderFromRankList(sortedList);
}
//订单分布
//日期全部时固定为5天
@@ -5535,7 +5684,8 @@
if (memberGiftRecord.getGiftFrom() == 2 && !memberGiftRecord.getShopId().equals(shopId)) {
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
-
+
+ merVerifyAwardVo.setUserId(member.getUserId());
merVerifyAwardVo.setUserName(member.getRealName());
merVerifyAwardVo.setUserMobile(member.getMobile());
if (1 == memberGiftRecord.getPrizeFrom()) {
@@ -7294,6 +7444,11 @@
}
mgtBasePlatformDto.setShopIdList(shopIdList);
// 从数据库中获取第三方订单统计
+ DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ mgtBasePlatformDto.setStartTime(LocalDate.parse(mgtBasePlatformDto.getStartDate(), dateFormatter)
+ .atStartOfDay());
+ mgtBasePlatformDto.setEndTime(LocalDate.parse(mgtBasePlatformDto.getEndDate(), dateFormatter)
+ .atTime(LocalTime.MAX));
vo = orderMapper.getPlTotalThirdOrderStatics(mgtBasePlatformDto);
return vo;
}
--
Gitblit v1.7.1