From 008ffb622f7e8b941245a4cf19042c7baef39b24 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 21 九月 2026 10:21:32 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java | 1547 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 1,368 insertions(+), 179 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 65d1676..82109a7 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
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.douyin.openapi.client.models.*;
import com.github.binarywang.wxpay.bean.ecommerce.*;
import com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum;
import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingNotifyResult;
@@ -16,8 +17,13 @@
import com.github.binarywang.wxpay.service.WxPayService;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
+import com.kuaishou.locallife.open.api.domain.locallife_order.OpenApiOrderAmountV1;
+import com.kuaishou.locallife.open.api.domain.locallife_order.OpenApiQueryOrderDetailInfoV1;
+import com.kuaishou.locallife.open.api.domain.locallife_trade.SimpleCertificateTimesCard;
+import com.kuaishou.locallife.open.api.domain.locallife_trade.SkuTImesCard;
+import com.kuaishou.locallife.open.api.domain.locallife_trade.VerifyPrepareDataNew;
+import com.kuaishou.locallife.open.api.domain.locallife_trade.VerifyResult;
import com.ruoyi.common.core.constant.CacheConstants;
-import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.UserStatus;
import com.ruoyi.common.core.exception.ServiceException;
@@ -29,6 +35,9 @@
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;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.account.OrderPayment;
@@ -48,6 +57,10 @@
import com.ruoyi.order.service.account.ProfitSharingService;
import com.ruoyi.order.service.order.*;
import com.ruoyi.order.util.HuiFuTianXiaUtil;
+import com.ruoyi.order.util.douyin.OrderUtil;
+import com.ruoyi.order.util.douyin.VerifyUtil;
+import com.ruoyi.order.util.kuaishou.KSOrderUtil;
+import com.ruoyi.order.util.kuaishou.KSVerifyUtil;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.constant.DelayTaskEnum;
import com.ruoyi.system.api.constant.SecurityConstant;
@@ -72,17 +85,19 @@
import lombok.extern.log4j.Log4j2;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.MathContext;
import java.math.RoundingMode;
-import java.text.NumberFormat;
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.*;
import java.util.concurrent.TimeUnit;
@@ -154,18 +169,20 @@
@Resource
private OrderPaymentService orderPaymentService;
-
+
@Resource
private ProfitSharingService profitSharingService;
-
+
@Resource
private OrderRefundService orderRefundService;
-
+
@Value("${wx.pay.callbackPath}")
private String callbackPath;
-
-
+ @Resource
+ private LotteryEventClient lotteryEventClient;
+
+
/**
* @description: buyGoods
* @param: appSureOrderDto
@@ -180,6 +197,7 @@
if(shop!=null&&shop.getShopStatus()!=1){
throw new ServiceException(AppErrorConstant.SHOP_CLOSED);
}
+// Shop belongShop = remoteShopService.getShop(shop.getBelongShopId()).getData();
// 初始化订单对象
AppSureOrderVo appSureOrderVo = new AppSureOrderVo();
// 初始化订单商品列表
@@ -263,8 +281,21 @@
appShopGoodsGetDto.setGoodsId(goods.getGoodsId());
appShopGoodsGetDto.setShopId(appSureOrderDto.getShopId());
ShopGoods shopGoods = remoteGoodsService.getShopGoods(appShopGoodsGetDto).getData();
+ //商户是否定制价格
if (shopGoods != null) {
goodsPrice = shopGoods.getSalesPrice();
+ }
+ //是否绑定经销商
+ if(shop.getBelongShopId()!=null &&shop.getShopType()==2){
+ //经销商定制价格
+ AppShopGoodsGetDto shopGoodsGetDto=new AppShopGoodsGetDto();
+ shopGoodsGetDto.setGoodsId(goods.getGoodsId());
+ shopGoodsGetDto.setShopId(shop.getBelongShopId());
+ Shop belongShop = remoteShopService.getShop(shop.getBelongShopId()).getData();
+ shopGoods = remoteGoodsService.getShopGoods(shopGoodsGetDto).getData();
+ if (1 == belongShop.getModifyPricePermission() && null != shopGoods) {
+ goodsPrice=shopGoods.getSalesPrice();
+ }
}
appSureOrderGoodsVo.setGoodsPrice(goodsPrice);
buyNumBig = BigDecimal.valueOf(buyNum);
@@ -374,6 +405,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;
}
@@ -449,6 +494,18 @@
if (shopGoods != null) {
goodsPrice = shopGoods.getSalesPrice();
}
+ //是否绑定经销商
+ if(shop.getBelongShopId()!=null &&shop.getShopType()==2){
+ //经销商定制价格
+ Shop belongShop = remoteShopService.getShop(shop.getBelongShopId()).getData();
+ appShopGoodsGetDto = new AppShopGoodsGetDto();
+ appShopGoodsGetDto.setGoodsId(goods.getGoodsId());
+ appShopGoodsGetDto.setShopId(belongShop.getShopId());
+ shopGoods = remoteGoodsService.getShopGoods(appShopGoodsGetDto).getData();
+ if (1 == belongShop.getModifyPricePermission() && null != shopGoods) {
+ goodsPrice = shopGoods.getSalesPrice();
+ }
+ }
appPanicBuyVo.setGoodsPrice(goodsPrice);
buyNumBig = BigDecimal.valueOf(buyNum);
goodsActivityPrice = activityGoodsGetVo.getActivityPrice();
@@ -470,6 +527,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;
}
@@ -554,6 +625,10 @@
//使用优惠券
StringJoiner memberCouponSJ = new StringJoiner(",");
List<String> goodsNameList = new ArrayList<>();
+ Shop shop = remoteShopService.getShop(appPlaceOrderDto.getShopId()).getData();
+ if(shop!=null&&shop.getShopStatus()!=1){
+ throw new ServiceException(AppErrorConstant.SHOP_CLOSED);
+ }
// 遍历购买的商品列表
for (AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList) {
appSureOrderGoodsVo = new AppSureOrderGoodsVo();
@@ -587,6 +662,19 @@
if (shopGoods != null) {
goodsPrice = shopGoods.getSalesPrice();
serviceNum = shopGoods.getServiceNum();
+ }
+ //是否绑定经销商
+ if(shop.getBelongShopId()!=null &&shop.getShopType()==2){
+ //经销商定制价格
+ Shop belongShop = remoteShopService.getShop(shop.getBelongShopId()).getData();
+ appShopGoodsGetDto = new AppShopGoodsGetDto();
+ appShopGoodsGetDto.setGoodsId(goods.getGoodsId());
+ appShopGoodsGetDto.setShopId(belongShop.getShopId());
+ shopGoods = remoteGoodsService.getShopGoods(appShopGoodsGetDto).getData();
+ if (1 == belongShop.getModifyPricePermission() && null != shopGoods) {
+ goodsPrice = shopGoods.getSalesPrice();
+ serviceNum = shopGoods.getServiceNum();
+ }
}
appSureOrderGoodsVo.setGoodsPrice(goodsPrice);
// 计算商品总价
@@ -784,6 +872,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;
}
@@ -1267,6 +1370,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());
@@ -1448,7 +1565,7 @@
appUserOrderGetVo.setCouponDiscount(order.getCouponMoney());
appUserOrderGetVo.setReceivableDeposit(order.getReceivableDeposit());
appUserOrderGetVo.setReceivableMoney(order.getReceivableMoney());
- appUserOrderGetVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getOnlinePayMoney()));
+ appUserOrderGetVo.setUnpaidMoney(order.getReceivableMoney().subtract(null == order.getOnlinePayMoney() ? BigDecimal.ZERO : order.getOnlinePayMoney()));
appUserOrderGetVo.setPayType(order.getPayType());
appUserOrderGetVo.setPayMoney(order.getPayMoney());
appUserOrderGetVo.setOrderRemark(order.getOrderRemark());
@@ -1468,6 +1585,7 @@
delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME);
}
appUserOrderGetVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(), delayTime));
+ appUserOrderGetVo.setCancelType(order.getCancelType());
return appUserOrderGetVo;
}
@@ -1486,10 +1604,10 @@
//删除待支付超时取消延时任务
redisService.deleteObject(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + orderId);
remoteConfigService.deleteDelayTask(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode()+"-"+orderId);
- this.autoCancelOrder(orderId);
+ this.autoCancelOrder(orderId, 3);
} else if (order.getOrderStatus() == 2) {
// 2.待核销 -> 订单退款
- this.refundOrder(orderId);
+ this.refundOrder(orderId, 3);
} else {
throw new ServiceException(AppErrorConstant.CANCEL_ERROR_ORDER);
}
@@ -1543,7 +1661,19 @@
appPlaceOrderVo.setSignType(payArr[4]);
appPlaceOrderVo.setPaySign(payArr[5]);
appPlaceOrderVo.setPrepayId(orderPayment.getPrepayId());
+ 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) {
+ 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());
+ }
+ }
return appPlaceOrderVo;
}
@@ -1634,12 +1764,18 @@
shopId = merHomeShopTotalVo.getShopId();
//获取今日到店
- Integer todayShop = userServiceRecordService.countShopServicePerson(shopId);
+ List<Integer> todayShop = userServiceRecordService.countShopServicePerson(shopId);
//获取待处理订单和营业额
merHomeShopTotalVo = orderMapper.getMerHomeShopTotalVo(shopId);
//获取服务统计
- MerHomeShopTotalVo serviceTotalVo = orderMapper.getMerHomeShopServiceTotalVo(shopId);
- merHomeShopTotalVo.setTodayShop(todayShop);
+ List<Long> userIds = remoteMemberService.listUserIdByShopId(Collections.singletonList(shopId)).getData();
+ if(userIds.isEmpty()){
+ userIds.add(0L);
+ }
+ log.info("查询首页数据参数：" + userIds.toString());
+ MerHomeShopTotalVo serviceTotalVo = orderMapper.getMerHomeShopServiceTotalVo(shopId, userIds);
+ log.info("查询首页数据：" + serviceTotalVo.toString());
+ merHomeShopTotalVo.setTodayShop(todayShop.size());
merHomeShopTotalVo.setCycleSurp(serviceTotalVo.getCycleSurp());
merHomeShopTotalVo.setExplorationSurp(serviceTotalVo.getExplorationSurp());
return merHomeShopTotalVo;
@@ -1770,14 +1906,20 @@
merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
merVerifyOrderVo.setPayType(order.getPayType());
merVerifyOrderVo.setRealReceiveMoney(order.getChangeReceivableMoney());
- if(order.getPayType()==1){
+ if (order.getPayType() == 1) {
merVerifyOrderVo.setReceiveMoney(order.getPayMoney());
- }else{
- if(order.getOfflinePayMoney()!=null){
+ } else {
+ if (order.getOfflinePayMoney() != null) {
merVerifyOrderVo.setReceiveMoney(order.getOfflinePayMoney());
- }else{
+ } else {
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());
@@ -1787,7 +1929,91 @@
// 返回结果
return merVerifyOrderVo;
}
-
+
+
+ @Override
+ public MerVerifyOrderVo verifyOrderDouYin(String orderId, Long shopId) {
+ Shop shop = remoteShopService.getShop(shopId).getData();
+ if(StringUtils.isEmpty(shop.getDyPoiId())){
+ throw new ServiceException("请先绑定抖音门店ID");
+ }
+ CertificatePrepareResponseData data = VerifyUtil.certificatePrepare(orderId);
+ if (null == data) {
+ throw new ServiceException("查询券信息失败");
+ }
+ List<CertificatePrepareResponseDataCertificatesItem> itemList = data.getCertificates();
+ if (null == itemList || itemList.isEmpty()) {
+ throw new ServiceException("查询券信息失败");
+ }
+ CertificatePrepareResponseDataCertificatesItem certificatesItem = itemList.get(0);
+ //商品信息
+ CertificatePrepareResponseDataCertificatesItemSku sku = certificatesItem.getSku();
+ //次卡信息
+ CertificatePrepareResponseDataCertificatesItemTimeCard timeCard = certificatesItem.getTimeCard();
+ //券的状态
+ Number status = certificatesItem.getStatus();
+ // 创建返回对象
+ MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
+ // 设置返回对象的属性值
+ merVerifyOrderVo.setOrderId(orderId);
+ merVerifyOrderVo.setOrderFrom(6);
+ merVerifyOrderVo.setOrderStatus((null == status || status.intValue() == 1) ? 2 : 3);
+ List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = new ArrayList<>();
+ AppUserOrderGoodsPageVo orderGoodsPageVo = new AppUserOrderGoodsPageVo();
+ orderGoodsPageVo.setGoodsName(sku.getTitle());
+ appUserOrderGoodsPageVoList.add(orderGoodsPageVo);
+ merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
+ if(null != timeCard){
+ merVerifyOrderVo.setLaveTime(timeCard.getTimesCount() - timeCard.getTimesUsed());
+ }else{
+ merVerifyOrderVo.setLaveTime(-1);
+ }
+ // 返回结果
+ return merVerifyOrderVo;
+ }
+
+
+ @Override
+ public MerVerifyOrderVo verifyOrderKuaiShou(String orderId, Long shopId) {
+ Shop shop = remoteShopService.getShop(shopId).getData();
+ if(StringUtils.isEmpty(shop.getKsPoiId())){
+ throw new ServiceException("请先绑定快手门店ID");
+ }
+ VerifyPrepareDataNew data = KSVerifyUtil.certificatePrepare(redisService, orderId);
+ if (null == data) {
+ throw new ServiceException("查询券信息失败");
+ }
+ List<SimpleCertificateTimesCard> itemList = data.getCertificates();
+ if (null == itemList || itemList.isEmpty()) {
+ throw new ServiceException("查询券信息失败");
+ }
+ SimpleCertificateTimesCard certificatesItem = itemList.get(0);
+ Long expire_time = certificatesItem.getExpire_time();
+ if(LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) > expire_time){
+ throw new ServiceException("优惠券已过期");
+ }
+ //商品信息
+ SkuTImesCard sku = certificatesItem.getSku();
+ // 创建返回对象
+ MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
+ // 设置返回对象的属性值
+ merVerifyOrderVo.setOrderId(orderId);
+ merVerifyOrderVo.setOrderFrom(7);
+ merVerifyOrderVo.setOrderStatus(2);
+ List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = new ArrayList<>();
+ AppUserOrderGoodsPageVo orderGoodsPageVo = new AppUserOrderGoodsPageVo();
+ orderGoodsPageVo.setGoodsName(sku.getTitle());
+ appUserOrderGoodsPageVoList.add(orderGoodsPageVo);
+ merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
+ if(null != sku.getTimes_count()){
+ merVerifyOrderVo.setLaveTime(sku.getTimes_count());
+ }else{
+ merVerifyOrderVo.setLaveTime(-1);
+ }
+ // 返回结果
+ return merVerifyOrderVo;
+ }
+
/**
* 确认核销订单
*
@@ -1809,9 +2035,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);
//绑定用户判断核销商户
@@ -1877,38 +2103,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();
@@ -1931,11 +2132,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);
@@ -1972,9 +2200,11 @@
merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
//判断用户是否绑定 2023-09-05需求改变核销时绑定用户
if (member.getBindingFlag() != 1) {
+ shopId = merVerifyOrderDto.getShopId();
+ order.setShopId(shopId);
//绑定商户
AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
- appMemberBindingDto.setShopId(order.getShopId());
+ appMemberBindingDto.setShopId(shopId);
appMemberBindingDto.setUserId(order.getUserId());
appMemberBindingDto.setBindingFlag(1);
if(order.getOrderFrom()==1){
@@ -1988,25 +2218,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();
@@ -2029,17 +2261,619 @@
remoteMemberService.changeMemberTotal(memberTotalChangeDto);
return merVerifyOrderVo;
}
-
+
+
/**
- * @description 分账实现
- * @author jqs
- * @date 2023/9/8 11:56
+ * 核销抖音券
+ *
+ * @return
+ */
+ @Override
+ @Transactional
+ @GlobalTransactional(rollbackFor = Exception.class)
+ public MerVerifyOrderVo sureVerifyOrderDouYin(MerVerifyOrderDto merVerifyOrderDto) {
+ String phone = merVerifyOrderDto.getPhone();
+ String name = merVerifyOrderDto.getName();
+ String orderId = merVerifyOrderDto.getOrderId();
+ Long shopId = merVerifyOrderDto.getShopId();
+ if(StringUtils.isEmpty(phone)){
+ throw new ServiceException("请填写核销用户电话号码");
+ }
+ if(StringUtils.isEmpty(name)){
+ throw new ServiceException("请填写核销用户姓名");
+ }
+ //获取核销商户
+ Shop shop = remoteShopService.getShop(shopId).getData();
+ CertificatePrepareResponseData data = VerifyUtil.certificatePrepare(orderId);
+ if (null == data) {
+ throw new ServiceException("查询券信息失败");
+ }
+ List<CertificatePrepareResponseDataCertificatesItem> itemList = data.getCertificates();
+ if (null == itemList && itemList.isEmpty()) {
+ throw new ServiceException("查询券信息失败");
+ }
+ List<CertificatePrepareResponseDataCertificatesItem> collect = itemList.stream().filter(s -> null == s.getStatus() || s.getStatus().intValue() == 1).collect(Collectors.toList());
+ if(collect.size() < merVerifyOrderDto.getNumber()){
+ throw new ServiceException("验券数量超过可使用数量");
+ }
+ List<CertificatePrepareResponseDataCertificatesItem> certificatePrepareResponseDataCertificatesItems = collect.subList(0, merVerifyOrderDto.getNumber());
+
+
+ CertificatePrepareResponseDataCertificatesItem certificatesItem = certificatePrepareResponseDataCertificatesItems.get(0);
+ //商品信息
+ CertificatePrepareResponseDataCertificatesItemSku sku = certificatesItem.getSku();
+ //次卡信息
+ CertificatePrepareResponseDataCertificatesItemTimeCard timeCard = certificatesItem.getTimeCard();
+ Number status = certificatesItem.getStatus();
+ if (null != status && status.intValue() == 2) {
+ throw new ServiceException("该抖音券不能重复核销");
+ }
+ if (null != status && status.intValue() != 1) {
+ throw new ServiceException("抖音券核销失败");
+ }
+ Member member = remoteMemberService.getMemberByMobile(phone).getData();//绑定用户判断核销商户
+ if(null == member){
+ //创建新用户
+ String memberId = IdUtils.simpleUUID();
+ SysUser sysUser = new SysUser();
+ sysUser.setUserName(memberId);
+ sysUser.setUserType("03");
+ sysUser.setNickName(name);
+ sysUser.setPhonenumber(phone);
+ sysUser.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
+ String password = "hongruitang";
+ sysUser.setPassword(SecurityUtils.encryptPassword(password));
+ sysUser = remoteUserService.registerUser(sysUser).getData();
+ member = new Member();
+ member.setMemberId(memberId);
+ member.setUserId(sysUser.getUserId());
+ member.setMobile(phone);
+ member.setRealName(name);
+ member.setNickName(name);
+ member.setBindingFlag(1);
+ member.setBindingType(3);
+ member.setRelationShopId(shopId);
+ member.setRelationShopName(shop.getShopName());
+ remoteMemberService.createNewMember(member);
+ }
+ if (member.getBindingFlag() == 1) {
+ if (!member.getRelationShopId().equals(shopId)) {
+ throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
+ }
+ }
+ //不是次卡才校验是否重复核销
+ if(null == timeCard){
+ Order one = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getTripartiteOrderId, data.getOrderId()));
+ if (null != one) {
+ throw new ServiceException("该抖音券不能重复核销");
+ }
+ }
+ List<String> encryptedCodes = new ArrayList<>();
+ for (CertificatePrepareResponseDataCertificatesItem certificatePrepareResponseDataCertificatesItem : certificatePrepareResponseDataCertificatesItems) {
+ encryptedCodes.add(certificatePrepareResponseDataCertificatesItem.getEncryptedCode());
+ }
+ List<CertificateVerifyResponseDataVerifyResultsItem> items = VerifyUtil.certificateVerify(data.getVerifyToken(), shop.getDyPoiId(), encryptedCodes);
+ if (null == items || items.isEmpty()) {
+ throw new ServiceException("抖音券核销失败");
+ }
+
+ TradeOrderQueryResponseData tradeOrderQueryResponseData = OrderUtil.queryOrderList(1, 10, data.getOrderId());
+ //原始金额
+ BigDecimal originAmount = BigDecimal.ZERO;
+ //支付金额
+ BigDecimal payAmount = BigDecimal.ZERO;
+ //优惠金额
+ BigDecimal payDiscountAmount = BigDecimal.ZERO;
+ Long createOrderTime = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
+ Long payTime = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
+ if (null != tradeOrderQueryResponseData) {
+ TradeOrderQueryResponseDataOrdersItem ordersItem = tradeOrderQueryResponseData.getOrders().get(0);
+ originAmount = BigDecimal.valueOf(ordersItem.getOriginalAmount()).divide(new BigDecimal(100));
+ payAmount = BigDecimal.valueOf(ordersItem.getPayAmount()).divide(new BigDecimal(100));
+ payDiscountAmount = BigDecimal.valueOf(ordersItem.getDiscountAmount()).divide(new BigDecimal(100));
+ createOrderTime = ordersItem.getCreateOrderTime();
+ payTime = ordersItem.getPayTime();
+ }
+
+ Date nowTime = new Date();
+ //开始添加订单数据
+ Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getTripartiteOrderId, data.getOrderId()));
+ if(null == order){
+ order = new Order();
+ order.setOrderId(IdUtils.fastSimpleUUID());
+ order.setDelFlag(0);
+ order.setOrderStatus(3);
+ order.setOrderNo(CodeFactoryUtil.getShopOrderNo());
+ order.setOrderFrom(6);
+ order.setShopId(shopId);
+ order.setUserId(member.getUserId());
+ order.setOrderMoney(originAmount);
+ order.setDiscountMoney(payDiscountAmount);
+ order.setReceivableMoney(payAmount);
+ order.setPayType(1);
+ order.setPayMoney(payAmount);
+ order.setOnlinePayMoney(payAmount);
+ order.setOrderRemark("抖音订单");
+ order.setCreateTime(new Date(createOrderTime * 1000));
+ order.setPayTime(new Date(payTime * 1000));
+ order.setTripartiteOrderId(data.getOrderId());
+ order.setUseTime(nowTime);
+ order.setUseUserId(merVerifyOrderDto.getUserId());
+ order.setCloseFlag(1);
+ order.setGoodsNum(itemList.size());
+ order.setCouponMoney(BigDecimal.ZERO);
+ this.save(order);
+ //创建服务商品
+ //获取商品信息(商品简介,调理问题)
+
+ OrderGoods orderGoods = new OrderGoods();
+ orderGoods.setOrderGoodsId(IdUtils.simpleUUID());
+ orderGoods.setDelFlag(0);
+ orderGoods.setOrderId(order.getOrderId());
+ orderGoods.setGoodsPrice(originAmount);
+ orderGoods.setGoodsTotalMoney(originAmount);
+ orderGoods.setGoodsReceivableMoney(originAmount);
+ orderGoods.setBuyNum(itemList.size());
+
+ ConsumerGoods consumerGoods = new ConsumerGoods();
+ consumerGoods.setUsedNum(merVerifyOrderDto.getNumber());
+ if(null != timeCard){
+ orderGoods.setBuyNum(itemList.size());
+ orderGoods.setServiceNum(merVerifyOrderDto.getNumber());
+ consumerGoods.setServiceNum(itemList.size());
+ consumerGoods.setUseTime(new Date());
+ }
+ orderGoods.setCycleNumFlag(1);
+ orderGoods.setGoodsType(2);
+ orderGoods.setGoodsName(sku.getTitle());
+ orderGoodsService.save(orderGoods);
+
+ consumerGoods.setConsumerGoodsId(IdUtils.simpleUUID());
+ consumerGoods.setDelFlag(0);
+ consumerGoods.setServiceStatus(1);
+ consumerGoods.setShopId(order.getShopId());
+ consumerGoods.setUserId(order.getUserId());
+ consumerGoods.setOrderId(order.getOrderId());
+ consumerGoods.setOrderGoodsId(orderGoods.getOrderGoodsId());
+ consumerGoods.setGoodsName(sku.getTitle());
+ consumerGoods.setCycleNumFlag(1);
+ consumerGoods.setCreateTime(nowTime);
+ consumerGoods.setGoodsType(2);
+ consumerGoods.setSourceFrom(1);
+ consumerGoodsService.save(consumerGoods);
+
+ //生成返回
+ MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
+ merVerifyOrderVo.setOrderId(order.getOrderId());
+ merVerifyOrderVo.setOrderNo(order.getOrderNo());
+ merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
+ merVerifyOrderVo.setOrderFrom(order.getOrderFrom());
+ merVerifyOrderVo.setOrderGoodsMoney(order.getOrderMoney());
+ merVerifyOrderVo.setCouponDiscount(order.getCouponMoney());
+ merVerifyOrderVo.setReceivableDeposit(order.getReceivableDeposit());
+ merVerifyOrderVo.setPayMoney(order.getPayMoney());
+ merVerifyOrderVo.setOrderRemark(order.getOrderRemark());
+ merVerifyOrderVo.setAppUserOrderGoodsPageVoList(new ArrayList<AppUserOrderGoodsPageVo>() {{
+ add(new AppUserOrderGoodsPageVo() {{
+ setOrderGoodsId(orderGoods.getOrderGoodsId());
+ setGoodsName(orderGoods.getGoodsName());
+ setGoodsType(orderGoods.getGoodsType());
+ setBuyNum(orderGoods.getBuyNum());
+ }});
+ }});
+ merVerifyOrderVo.setCreateTime(order.getCreateTime());
+ merVerifyOrderVo.setPayTime(order.getPayTime());
+ merVerifyOrderVo.setUseTime(order.getUseTime());
+ merVerifyOrderVo.setPayType(order.getPayType());
+ merVerifyOrderVo.setRealReceiveMoney(order.getChangeReceivableMoney());
+ //根据支付方式返回应收金额和已收金额
+ if (order.getPayType() == 1) {
+ merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getPayMoney()));
+ merVerifyOrderVo.setReceiveMoney(order.getPayMoney());
+ } else {
+ merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getCouponMoney()).subtract(order.getReceivableDeposit()));
+ if (order.getOfflinePayMoney() != null) {
+ merVerifyOrderVo.setReceiveMoney(order.getOfflinePayMoney());
+ } else {
+ merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
+ }
+ }
+ merVerifyOrderVo.setUnReceiveMoney(BigDecimal.ZERO);
+ merVerifyOrderVo.setUserId(order.getUserId());
+ merVerifyOrderVo.setUserName(member.getRealName());
+ merVerifyOrderVo.setUserMobile(member.getMobile());
+ merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
+ //判断用户是否绑定 2023-09-05需求改变核销时绑定用户
+ if (member.getBindingFlag() != 1) {
+ //绑定商户
+ AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
+ appMemberBindingDto.setShopId(order.getShopId());
+ appMemberBindingDto.setUserId(order.getUserId());
+ appMemberBindingDto.setBindingFlag(1);
+ if (order.getOrderFrom() == 1) {
+ appMemberBindingDto.setBindingType(1);
+ } else if (order.getOrderFrom() == 2) {
+ appMemberBindingDto.setBindingType(2);
+ }
+ remoteMemberService.updateMemberBinding(appMemberBindingDto);
+ order.setNewMemberFlag(1);
+ } else {
+ order.setNewMemberFlag(0);
+ }
+ this.saveOrUpdate(order);
+ //更新用户积分和消费统计
+ MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
+ memberTotalChangeDto.setUserId(order.getUserId());
+ // 如果存在积分兑换比例，则计算积分
+ if (redisService.hasKey(SecurityConstant.PAY_MONEY_INTEGRAL)) {
+ Integer moneyValue = redisService.getCacheObject(SecurityConstant.PAY_MONEY_INTEGRAL);
+ BigDecimal moneyValueBig = BigDecimal.valueOf(moneyValue);
+ BigDecimal integralBig = moneyValueBig.multiply(order.getOnlinePayMoney()).setScale(0, BigDecimal.ROUND_HALF_UP);
+ Integer integral = Integer.valueOf(integralBig.toString());
+ if (integral > 0) {
+ memberTotalChangeDto.setChangeIntegral(integral);
+ memberTotalChangeDto.setTypeIntegral(1);
+ memberTotalChangeDto.setOrderId(order.getOrderId());
+ memberTotalChangeDto.setOrderNo(order.getOrderNo());
+ }
+ }
+ //更新消费时间
+ memberTotalChangeDto.setConsumeTime(nowTime);
+ remoteMemberService.changeMemberTotal(memberTotalChangeDto);
+ return merVerifyOrderVo;
+ }else{
+ //扣减剩余次数
+ OrderGoods orderGoods = orderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderId, order.getOrderId()));
+ if(null != orderGoods.getServiceNum()){
+ orderGoods.setServiceNum(orderGoods.getServiceNum() + merVerifyOrderDto.getNumber());
+ }
+ orderGoodsService.updateById(orderGoods);
+ ConsumerGoods consumerGoods = consumerGoodsService.getOne(new LambdaQueryWrapper<ConsumerGoods>().eq(ConsumerGoods::getOrderId, order.getOrderId()).eq(ConsumerGoods::getOrderGoodsId, orderGoods.getOrderGoodsId()));
+ consumerGoods.setUsedNum(consumerGoods.getUsedNum() + merVerifyOrderDto.getNumber());
+ consumerGoods.setUseTime(new Date());
+ if(consumerGoods.getUsedNum() == consumerGoods.getServiceNum()){
+ consumerGoods.setCompleteTime(new Date());
+ }
+ consumerGoodsService.updateById(consumerGoods);
+ //生成返回
+ MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
+ merVerifyOrderVo.setOrderId(order.getOrderId());
+ merVerifyOrderVo.setOrderNo(order.getOrderNo());
+ merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
+ merVerifyOrderVo.setOrderFrom(order.getOrderFrom());
+ merVerifyOrderVo.setOrderGoodsMoney(order.getOrderMoney());
+ merVerifyOrderVo.setCouponDiscount(order.getCouponMoney());
+ merVerifyOrderVo.setReceivableDeposit(order.getReceivableDeposit());
+ merVerifyOrderVo.setPayMoney(order.getPayMoney());
+ merVerifyOrderVo.setOrderRemark(order.getOrderRemark());
+ merVerifyOrderVo.setAppUserOrderGoodsPageVoList(new ArrayList<AppUserOrderGoodsPageVo>() {{
+ add(new AppUserOrderGoodsPageVo() {{
+ setOrderGoodsId(orderGoods.getOrderGoodsId());
+ setGoodsName(orderGoods.getGoodsName());
+ setGoodsType(orderGoods.getGoodsType());
+ setBuyNum(orderGoods.getBuyNum());
+ }});
+ }});
+ merVerifyOrderVo.setCreateTime(order.getCreateTime());
+ merVerifyOrderVo.setPayTime(order.getPayTime());
+ merVerifyOrderVo.setUseTime(order.getUseTime());
+ merVerifyOrderVo.setPayType(order.getPayType());
+ merVerifyOrderVo.setRealReceiveMoney(order.getChangeReceivableMoney());
+ //根据支付方式返回应收金额和已收金额
+ if (order.getPayType() == 1) {
+ merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getPayMoney()));
+ merVerifyOrderVo.setReceiveMoney(order.getPayMoney());
+ } else {
+ merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getCouponMoney()).subtract(order.getReceivableDeposit()));
+ if (order.getOfflinePayMoney() != null) {
+ merVerifyOrderVo.setReceiveMoney(order.getOfflinePayMoney());
+ } else {
+ merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
+ }
+ }
+ merVerifyOrderVo.setUnReceiveMoney(BigDecimal.ZERO);
+ merVerifyOrderVo.setUserId(order.getUserId());
+ merVerifyOrderVo.setUserName(member.getRealName());
+ merVerifyOrderVo.setUserMobile(member.getMobile());
+ merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
+ return merVerifyOrderVo;
+ }
+ }
+
+
+ /**
+ * 核销快手券
+ *
+ * @return
+ */
+ @Override
+ @Transactional
+ @GlobalTransactional(rollbackFor = Exception.class)
+ public MerVerifyOrderVo sureVerifyOrderKuaiShou(MerVerifyOrderDto merVerifyOrderDto) {
+ String phone = merVerifyOrderDto.getPhone();
+ String name = merVerifyOrderDto.getName();
+ String orderId = merVerifyOrderDto.getOrderId();
+ Long shopId = merVerifyOrderDto.getShopId();
+ if(StringUtils.isEmpty(phone)){
+ throw new ServiceException("请填写核销用户电话号码");
+ }
+ if(StringUtils.isEmpty(name)){
+ throw new ServiceException("请填写核销用户姓名");
+ }
+ //获取核销商户
+ Shop shop = remoteShopService.getShop(shopId).getData();
+ VerifyPrepareDataNew data = KSVerifyUtil.certificatePrepare(redisService, orderId);
+ if (null == data) {
+ throw new ServiceException("查询券信息失败");
+ }
+ List<SimpleCertificateTimesCard> itemList = data.getCertificates();
+ if (null == itemList || itemList.isEmpty()) {
+ throw new ServiceException("查询券信息失败");
+ }
+ List<SimpleCertificateTimesCard> timesCards = itemList.subList(0, merVerifyOrderDto.getNumber());
+ SimpleCertificateTimesCard certificatesItem = timesCards.get(0);
+ Long expire_time = certificatesItem.getExpire_time();
+ if(LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8")) > expire_time){
+ throw new ServiceException("优惠券已过期");
+ }
+ //商品信息
+ SkuTImesCard sku = certificatesItem.getSku();
+ if(null == sku.getTimes_count()){
+ Order one = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getTripartiteOrderId, data.getOrder_id()));
+ if (null != one) {
+ throw new ServiceException("该快手券不能重复核销");
+ }
+ }
+
+ Member member = remoteMemberService.getMemberByMobile(phone).getData();
+ //绑定用户判断核销商户
+ if (member.getBindingFlag() == 1) {
+ if (!member.getRelationShopId().equals(shopId)) {
+ throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
+ }
+ }
+
+ List<String> encryptedCodes = new ArrayList<>();
+ for (SimpleCertificateTimesCard timesCard : timesCards) {
+ encryptedCodes.add(timesCard.getEncrypted_code());
+ }
+ List<VerifyResult> items = KSVerifyUtil.certificateVerify(redisService, data.getVerify_token(), shop.getKsPoiId(), encryptedCodes, data.getOrder_id());
+ if (null == items || items.isEmpty()) {
+ throw new ServiceException("快手券核销失败");
+ }
+
+ OpenApiQueryOrderDetailInfoV1 orderDetailInfoV1 = KSOrderUtil.queryOrderInfo(redisService, data.getOrder_id());
+ //原始金额
+ BigDecimal originAmount = BigDecimal.ZERO;
+ //支付金额
+ BigDecimal payAmount = BigDecimal.ZERO;
+ //优惠金额
+ BigDecimal payDiscountAmount = BigDecimal.ZERO;
+ Long create_order_time = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
+ Long pay_time = LocalDateTime.now().toEpochSecond(ZoneOffset.of("+8"));
+ if (null != orderDetailInfoV1) {
+ OpenApiOrderAmountV1 amountInfo = orderDetailInfoV1.getAmount();
+ originAmount = BigDecimal.valueOf(amountInfo.getTotal_amount());
+ payAmount = BigDecimal.valueOf(amountInfo.getPay_amount());
+ payDiscountAmount = originAmount.subtract(payAmount);
+ create_order_time = orderDetailInfoV1.getCreate_order_time();
+ pay_time = orderDetailInfoV1.getPay_time();
+ }
+
+ Date nowTime = new Date();
+ Order order = this.getOne(new LambdaQueryWrapper<Order>().eq(Order::getTripartiteOrderId, data.getOrder_id()));
+ if(null == order){
+ //开始添加订单数据
+ order = new Order();
+ order.setOrderId(IdUtils.fastSimpleUUID());
+ order.setDelFlag(0);
+ order.setOrderStatus(3);
+ order.setOrderNo(CodeFactoryUtil.getShopOrderNo());
+ order.setOrderFrom(7);
+ order.setShopId(shopId);
+ order.setUserId(member.getUserId());
+ order.setOrderMoney(originAmount.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_EVEN));
+ order.setDiscountMoney(payDiscountAmount.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_EVEN));
+ order.setReceivableMoney(payAmount.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_EVEN));
+ order.setPayType(1);
+ order.setPayMoney(payAmount.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_EVEN));
+ order.setOnlinePayMoney(payAmount.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_EVEN));
+ order.setOrderRemark("快手订单");
+ order.setCreateTime(new Date(create_order_time));
+ order.setPayTime(new Date(pay_time));
+ order.setTripartiteOrderId(data.getOrder_id());
+ order.setUseTime(nowTime);
+ order.setUseUserId(merVerifyOrderDto.getUserId());
+ order.setCloseFlag(1);
+ order.setGoodsNum(itemList.size());
+ order.setCouponMoney(BigDecimal.ZERO);
+ this.save(order);
+ //创建服务商品
+ //获取商品信息(商品简介,调理问题)
+
+ OrderGoods orderGoods = new OrderGoods();
+ orderGoods.setOrderGoodsId(IdUtils.simpleUUID());
+ orderGoods.setDelFlag(0);
+ orderGoods.setOrderId(order.getOrderId());
+ orderGoods.setGoodsId(sku.getSku_id());
+ orderGoods.setBuyNum(itemList.size());
+ orderGoods.setGoodsPrice(originAmount);
+ orderGoods.setGoodsTotalMoney(originAmount);
+ orderGoods.setGoodsReceivableMoney(originAmount);
+ orderGoods.setCycleNumFlag(1);
+ orderGoods.setServiceNum(merVerifyOrderDto.getNumber());
+ orderGoods.setGoodsType(2);
+ orderGoods.setGoodsName(sku.getTitle());
+ orderGoodsService.save(orderGoods);
+
+ ConsumerGoods consumerGoods = new ConsumerGoods();
+ consumerGoods.setConsumerGoodsId(IdUtils.simpleUUID());
+ consumerGoods.setDelFlag(0);
+ consumerGoods.setServiceStatus(1);
+ consumerGoods.setShopId(order.getShopId());
+ consumerGoods.setUserId(order.getUserId());
+ consumerGoods.setOrderId(order.getOrderId());
+ consumerGoods.setGoodsId(sku.getSku_id());
+ consumerGoods.setOrderGoodsId(orderGoods.getOrderGoodsId());
+ consumerGoods.setGoodsName(sku.getTitle());
+ consumerGoods.setCycleNumFlag(1);
+ consumerGoods.setServiceNum(itemList.size());
+ consumerGoods.setUsedNum(merVerifyOrderDto.getNumber());
+ consumerGoods.setUseTime(new Date());
+ consumerGoods.setCreateTime(nowTime);
+ consumerGoods.setGoodsType(2);
+ consumerGoods.setSourceFrom(1);
+ consumerGoodsService.save(consumerGoods);
+ //生成返回
+ MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
+ merVerifyOrderVo.setOrderId(order.getOrderId());
+ merVerifyOrderVo.setOrderNo(order.getOrderNo());
+ merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
+ merVerifyOrderVo.setOrderFrom(order.getOrderFrom());
+ merVerifyOrderVo.setOrderGoodsMoney(order.getOrderMoney());
+ merVerifyOrderVo.setCouponDiscount(order.getCouponMoney());
+ merVerifyOrderVo.setReceivableDeposit(order.getReceivableDeposit());
+ merVerifyOrderVo.setPayMoney(order.getPayMoney());
+ merVerifyOrderVo.setOrderRemark(order.getOrderRemark());
+ merVerifyOrderVo.setAppUserOrderGoodsPageVoList(new ArrayList<AppUserOrderGoodsPageVo>() {{
+ add(new AppUserOrderGoodsPageVo() {{
+ setOrderGoodsId(orderGoods.getOrderGoodsId());
+ setGoodsName(orderGoods.getGoodsName());
+ setGoodsType(orderGoods.getGoodsType());
+ setBuyNum(orderGoods.getBuyNum());
+ }});
+ }});
+ merVerifyOrderVo.setCreateTime(order.getCreateTime());
+ merVerifyOrderVo.setPayTime(order.getPayTime());
+ merVerifyOrderVo.setUseTime(order.getUseTime());
+ merVerifyOrderVo.setPayType(order.getPayType());
+ merVerifyOrderVo.setRealReceiveMoney(order.getChangeReceivableMoney());
+ //根据支付方式返回应收金额和已收金额
+ if (order.getPayType() == 1) {
+ merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getPayMoney()));
+ merVerifyOrderVo.setReceiveMoney(order.getPayMoney());
+ } else {
+ merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getCouponMoney()).subtract(order.getReceivableDeposit()));
+ if (order.getOfflinePayMoney() != null) {
+ merVerifyOrderVo.setReceiveMoney(order.getOfflinePayMoney());
+ } else {
+ merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
+ }
+ }
+ merVerifyOrderVo.setUnReceiveMoney(BigDecimal.ZERO);
+ merVerifyOrderVo.setUserId(order.getUserId());
+ merVerifyOrderVo.setUserName(member.getRealName());
+ merVerifyOrderVo.setUserMobile(member.getMobile());
+ merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
+ //判断用户是否绑定 2023-09-05需求改变核销时绑定用户
+ if (member.getBindingFlag() != 1) {
+ //绑定商户
+ AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
+ appMemberBindingDto.setShopId(order.getShopId());
+ appMemberBindingDto.setUserId(order.getUserId());
+ appMemberBindingDto.setBindingFlag(1);
+ if (order.getOrderFrom() == 1) {
+ appMemberBindingDto.setBindingType(1);
+ } else if (order.getOrderFrom() == 2) {
+ appMemberBindingDto.setBindingType(2);
+ }
+ remoteMemberService.updateMemberBinding(appMemberBindingDto);
+ order.setNewMemberFlag(1);
+ } else {
+ order.setNewMemberFlag(0);
+ }
+ this.saveOrUpdate(order);
+ //更新用户积分和消费统计
+ MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
+ memberTotalChangeDto.setUserId(order.getUserId());
+ // 如果存在积分兑换比例，则计算积分
+ if (redisService.hasKey(SecurityConstant.PAY_MONEY_INTEGRAL)) {
+ Integer moneyValue = redisService.getCacheObject(SecurityConstant.PAY_MONEY_INTEGRAL);
+ BigDecimal moneyValueBig = BigDecimal.valueOf(moneyValue);
+ BigDecimal integralBig = moneyValueBig.multiply(order.getOnlinePayMoney()).setScale(0, BigDecimal.ROUND_HALF_UP);
+ Integer integral = Integer.valueOf(integralBig.toString());
+ if (integral > 0) {
+ memberTotalChangeDto.setChangeIntegral(integral);
+ memberTotalChangeDto.setTypeIntegral(1);
+ memberTotalChangeDto.setOrderId(order.getOrderId());
+ memberTotalChangeDto.setOrderNo(order.getOrderNo());
+ }
+ }
+ //更新消费时间
+ memberTotalChangeDto.setConsumeTime(nowTime);
+ remoteMemberService.changeMemberTotal(memberTotalChangeDto);
+ return merVerifyOrderVo;
+ }else{
+ //扣减剩余次数
+ OrderGoods orderGoods = orderGoodsService.getOne(new LambdaQueryWrapper<OrderGoods>().eq(OrderGoods::getOrderId, order.getOrderId()));
+ orderGoods.setServiceNum(orderGoods.getServiceNum() + itemList.size());
+ orderGoodsService.updateById(orderGoods);
+
+ ConsumerGoods consumerGoods = consumerGoodsService.getOne(new LambdaQueryWrapper<ConsumerGoods>().eq(ConsumerGoods::getOrderId, order.getOrderId()).eq(ConsumerGoods::getOrderGoodsId, orderGoods.getOrderGoodsId()));
+ consumerGoods.setUsedNum(consumerGoods.getUsedNum() + itemList.size());
+ consumerGoods.setUseTime(new Date());
+ if(consumerGoods.getUsedNum() == consumerGoods.getServiceNum()){
+ consumerGoods.setCompleteTime(new Date());
+ }
+ consumerGoodsService.updateById(consumerGoods);
+ //生成返回
+ MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
+ merVerifyOrderVo.setOrderId(order.getOrderId());
+ merVerifyOrderVo.setOrderNo(order.getOrderNo());
+ merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
+ merVerifyOrderVo.setOrderFrom(order.getOrderFrom());
+ merVerifyOrderVo.setOrderGoodsMoney(order.getOrderMoney());
+ merVerifyOrderVo.setCouponDiscount(order.getCouponMoney());
+ merVerifyOrderVo.setReceivableDeposit(order.getReceivableDeposit());
+ merVerifyOrderVo.setPayMoney(order.getPayMoney());
+ merVerifyOrderVo.setOrderRemark(order.getOrderRemark());
+ merVerifyOrderVo.setAppUserOrderGoodsPageVoList(new ArrayList<AppUserOrderGoodsPageVo>() {{
+ add(new AppUserOrderGoodsPageVo() {{
+ setOrderGoodsId(orderGoods.getOrderGoodsId());
+ setGoodsName(orderGoods.getGoodsName());
+ setGoodsType(orderGoods.getGoodsType());
+ setBuyNum(orderGoods.getBuyNum());
+ }});
+ }});
+ merVerifyOrderVo.setCreateTime(order.getCreateTime());
+ merVerifyOrderVo.setPayTime(order.getPayTime());
+ merVerifyOrderVo.setUseTime(order.getUseTime());
+ merVerifyOrderVo.setPayType(order.getPayType());
+ merVerifyOrderVo.setRealReceiveMoney(order.getChangeReceivableMoney());
+ //根据支付方式返回应收金额和已收金额
+ if (order.getPayType() == 1) {
+ merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getPayMoney()));
+ merVerifyOrderVo.setReceiveMoney(order.getPayMoney());
+ } else {
+ merVerifyOrderVo.setReceivableMoney(order.getOrderMoney().subtract(order.getCouponMoney()).subtract(order.getReceivableDeposit()));
+ if (order.getOfflinePayMoney() != null) {
+ merVerifyOrderVo.setReceiveMoney(order.getOfflinePayMoney());
+ } else {
+ merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
+ }
+ }
+ merVerifyOrderVo.setUnReceiveMoney(BigDecimal.ZERO);
+ merVerifyOrderVo.setUserId(order.getUserId());
+ merVerifyOrderVo.setUserName(member.getRealName());
+ merVerifyOrderVo.setUserMobile(member.getMobile());
+ merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
+ return merVerifyOrderVo;
+ }
+
+ }
+
+
+
+ /**
* @param orderId
* @param orderNo
* @param shopId
* @param orderMoney
* @param orderFrom
- * @return void
+ * @return void
+ * @description 分账实现
+ * @author jqs
+ * @date 2023/9/8 11:56
*/
private void submitProfitSharing(String orderId, String orderNo, Long shopId, BigDecimal orderMoney, Integer orderFrom) {
String sendMessage = "";
@@ -2405,20 +3239,20 @@
Long shopId = shopRelUserVo.getShopId();
Shop shop = remoteShopService.getShop(shopId).getData();
//平台奖品判断
- if (memberGiftRecord.getGiftFrom() == 1) {
+ if (memberGiftRecord.getGiftFrom() == 1 && memberGiftRecord.getPrizeFrom() == 1) {
BirthdayCard birthdayCard = remoteMemberService.getBirthdayCard().getData();
//判断生日活动状态
- if(birthdayCard!=null&&birthdayCard.getCardStatus()==1){
+ if (birthdayCard != null && birthdayCard.getCardStatus() == 1) {
shop = remoteShopService.getShop(shopId).getData();
//判断指定区域全部店铺
- if(birthdayCard.getAreaFlag()==2&&birthdayCard.getShopFlag()==1&&!StringUtils.checkString(birthdayCard.getDesignatedArea(),shop.getShopCityCode())){
+ if (birthdayCard.getAreaFlag() == 2 && birthdayCard.getShopFlag() == 1 && !StringUtils.checkString(birthdayCard.getDesignatedArea(), shop.getShopCityCode())) {
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
//判断指定店铺
- if(birthdayCard.getShopFlag()==2&&!StringUtils.checkString(birthdayCard.getApplicableShop(),shopId.toString())){
+ if (birthdayCard.getShopFlag() == 2 && !StringUtils.checkString(birthdayCard.getApplicableShop(), shopId.toString())) {
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
- }else{
+ } else {
throw new ServiceException(AppErrorConstant.BIRTHDAY_CARD_ERROR);
}
}
@@ -2427,29 +3261,35 @@
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
Member member = remoteMemberService.getMember(memberGiftRecord.getUserId()).getData();
-
+
merVerifyAwardVo.setUserName(member.getRealName());
merVerifyAwardVo.setUserMobile(member.getMobile());
- if (memberGiftRecord.getGiftFrom() == 1) {
- merVerifyAwardVo.setGiftFrom("平台生日卡");
+ if (memberGiftRecord.getPrizeFrom() == 1) {
+ if (memberGiftRecord.getGiftFrom() == 1) {
+ merVerifyAwardVo.setGiftFrom("平台生日卡");
+ } else {
+ merVerifyAwardVo.setGiftFrom("商户生日卡");
+ }
} else {
- merVerifyAwardVo.setGiftFrom("商户生日卡");
+ merVerifyAwardVo.setGiftFrom("抽奖");
}
merVerifyAwardVo.setGiftType(memberGiftRecord.getGiftType());
List<BirthdayGiftSendDto> giftSendDtoList = new ArrayList<>();
BirthdayGiftSendDto birthdayGiftSendDto = new BirthdayGiftSendDto();
switch (memberGiftRecord.getGiftType()) {
case 1:
- merVerifyAwardVo.setGiftName(memberGiftRecord.getCouponName());
- merVerifyAwardVo.setGiftNumber(Double.valueOf(memberGiftRecord.getCouponNumber()));
- birthdayGiftSendDto.setUserId(memberGiftRecord.getUserId());
- birthdayGiftSendDto.setGiftType(memberGiftRecord.getGiftType());
- birthdayGiftSendDto.setGiftFrom(memberGiftRecord.getGiftFrom());
- birthdayGiftSendDto.setShopId(memberGiftRecord.getShopId());
- birthdayGiftSendDto.setCouponId(memberGiftRecord.getCouponId());
- birthdayGiftSendDto.setCouponNumber(memberGiftRecord.getCouponNumber());
- giftSendDtoList.add(birthdayGiftSendDto);
- remoteCouponService.sendCouponGift(giftSendDtoList);
+ if (memberGiftRecord.getPrizeFrom() == 1) {
+ merVerifyAwardVo.setGiftName(memberGiftRecord.getCouponName());
+ merVerifyAwardVo.setGiftNumber(Double.valueOf(memberGiftRecord.getCouponNumber()));
+ birthdayGiftSendDto.setUserId(memberGiftRecord.getUserId());
+ birthdayGiftSendDto.setGiftType(memberGiftRecord.getGiftType());
+ birthdayGiftSendDto.setGiftFrom(memberGiftRecord.getGiftFrom());
+ birthdayGiftSendDto.setShopId(memberGiftRecord.getShopId());
+ birthdayGiftSendDto.setCouponId(memberGiftRecord.getCouponId());
+ birthdayGiftSendDto.setCouponNumber(memberGiftRecord.getCouponNumber());
+ giftSendDtoList.add(birthdayGiftSendDto);
+ remoteCouponService.sendCouponGift(giftSendDtoList);
+ }
break;
case 2:
Goods goods = remoteGoodsService.getGoods(memberGiftRecord.getGoodsId()).getData();
@@ -2472,10 +3312,22 @@
birthdayGiftSendDto.setGoodsNumber(memberGiftRecord.getGoodsNumber());
giftSendDtoList.add(birthdayGiftSendDto);
consumerGoodsService.sendGoodsGift(giftSendDtoList);
+ //抽奖奖品中的平台商品需要生成订单数据
+ if (memberGiftRecord.getPrizeFrom() == 2) {
+ 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:
- merVerifyAwardVo.setGiftName("现金");
- merVerifyAwardVo.setGiftNumber(memberGiftRecord.getMoney().doubleValue());
+ if (memberGiftRecord.getPrizeFrom() == 1) {
+ merVerifyAwardVo.setGiftName("现金");
+ merVerifyAwardVo.setGiftNumber(memberGiftRecord.getMoney().doubleValue());
+ }
break;
case 4:
merVerifyAwardVo.setGiftName(memberGiftRecord.getGiftName());
@@ -2503,8 +3355,73 @@
merVerifyAwardVo.setVerifyStatus(2);
return merVerifyAwardVo;
}
-
-
+
+
+ /**
+ * 抽奖的平台商品生成订单--待审核
+ *
+ * @param shopId
+ * @param userId
+ * @param goods
+ * @param goodsNum
+ */
+ 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(status);
+ order.setOrderNo(CodeFactoryUtil.getShopOrderNo());
+ order.setOrderFrom(4);
+ order.setShopId(shopId);
+ order.setUserId(userId);
+ order.setOrderMoney(null == goods ? BigDecimal.ZERO : goods.getSalesPrice());
+ order.setCouponMoney(BigDecimal.ZERO);
+ order.setDiscountMoney(BigDecimal.ZERO);
+ order.setReceivableMoney(BigDecimal.ZERO);
+ order.setPayType(1);
+ order.setPayMoney(BigDecimal.ZERO);
+ order.setOrderRemark("抽奖订单");
+ order.setCreateTime(new Date());
+ order.setPayTime(new Date());
+ order.setUseTime(new Date());
+ order.setUseUserId(userId);
+ order.setGoodsNum(goodsNum);
+ order.setReceivableDeposit(BigDecimal.ZERO);
+ order.setCloseFlag(1);
+ order.setActivityId(giftId);
+ this.save(order);
+ OrderGoods orderGoods = new OrderGoods();
+ orderGoods.setOrderGoodsId(IdUtils.simpleUUID());
+ orderGoods.setDelFlag(0);
+ orderGoods.setOrderId(order.getOrderId());
+ orderGoods.setBuyNum(goodsNum);
+ 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);
+ }
+ orderGoodsService.save(orderGoods);
+ }
+
+
/**
* 收银未结清订单列表
*
@@ -2521,14 +3438,25 @@
if (merMemberNoClearOrderVo.getUnPaidMoney() == null) {
merMemberNoClearOrderVo.setUnPaidMoney(zeroBig);
}
- if(merMemberNoClearOrderVo.getUnPaidMoney().compareTo(zeroBig)<0){
+ 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;
}
-
+
/**
* 结清订单
*
@@ -2891,7 +3819,7 @@
Long userId;
Member member;
Integer orderFrom;
- String orderFromDesc;
+ String orderFromDesc = "";
BigDecimal zeroBig = new BigDecimal("0.00");
StringJoiner userIdSj = new StringJoiner(",");
// 遍历订单列表
@@ -2905,8 +3833,16 @@
orderFromDesc = "商城订单";
} else if (orderFrom == 2) {
orderFromDesc = "平台秒杀活动(" + merOrderPageVo.getActivityName() + ")";
- } else {
+ } else if(orderFrom == 3) {
orderFromDesc = "线下创建";
+ }else if(orderFrom == 4) {
+ orderFromDesc = "抽奖";
+ }else if(orderFrom == 5) {
+ orderFromDesc = "美团";
+ }else if(orderFrom == 6) {
+ orderFromDesc = "抖音";
+ }else if(orderFrom == 7) {
+ orderFromDesc = "快手";
}
} else {
orderFromDesc = "商城订单";
@@ -2955,9 +3891,27 @@
if (merMemberNoClearOrderVo.getUnPaidMoney() == null) {
merMemberNoClearOrderVo.setUnPaidMoney(zeroBig);
}
- if(merMemberNoClearOrderVo.getUnPaidMoney().compareTo(zeroBig)<0){
+ if (merMemberNoClearOrderVo.getUnPaidMoney().compareTo(zeroBig) < 0) {
merMemberNoClearOrderVo.setUnPaidMoney(zeroBig);
}
+ List<MerCouponGoodsListVo> goodsList = new ArrayList<>();
+ orderGoodsService.listByOrderId(merMemberNoClearOrderVo.getOrderId()).forEach(orderGoodsVo -> {
+ MerCouponGoodsListVo merCouponGoodsListVo = new MerCouponGoodsListVo();
+ merCouponGoodsListVo.setGoodsId(orderGoodsVo.getGoodsId());
+ merCouponGoodsListVo.setGoodsName(orderGoodsVo.getGoodsName());
+ merCouponGoodsListVo.setGoodsNum(orderGoodsVo.getBuyNum());
+ if (orderGoodsVo.getGoodsType() == 1) {
+ merCouponGoodsListVo.setGoodsType("周期");
+ } else if (orderGoodsVo.getGoodsType() == 2) {
+ merCouponGoodsListVo.setGoodsType("服务");
+ } else if (orderGoodsVo.getGoodsType() == 3) {
+ merCouponGoodsListVo.setGoodsType("体验");
+ } else if (orderGoodsVo.getGoodsType() == 4) {
+ merCouponGoodsListVo.setGoodsType("单品");
+ }
+ goodsList.add(merCouponGoodsListVo);
+ });
+ merMemberNoClearOrderVo.setGoodsList(goodsList);
}
}
return merMemberNoClearOrderVoList;
@@ -3074,9 +4028,10 @@
mgtShopOrderPageDto.setShopIds(shopIds);
}
-
+ System.err.println("查询条件：" + JSON.toJSONString(mgtShopOrderPageDto));
// 从数据库中获取活动订单列表
List<MgtActivityOrderPageVo> activityOrderPageVoList = orderMapper.pageMgtActivityOrder(page, mgtShopOrderPageDto);
+ System.err.println("查询导出数据条数：" + activityOrderPageVoList.size());
// 如果列表不为空
if (!activityOrderPageVoList.isEmpty()) {
// 定义变量
@@ -3174,6 +4129,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());
@@ -3184,6 +4141,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;
}
@@ -3249,7 +4212,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();
@@ -3340,6 +4303,7 @@
}
// 设置订单编号
mgtOrderDetailVo.setOrderNo(order.getOrderNo());
+ mgtOrderDetailVo.setTripartiteOrderId(order.getTripartiteOrderId());
mgtOrderDetailVo.setOutTradeNo(order.getOutTradeNo());
// 设置订单来源
switch (order.getOrderFrom()) {
@@ -3570,7 +4534,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);
}
}
@@ -4004,6 +4968,12 @@
mgtTotalOrderTotalVo.setExperienceTotal(0);
mgtTotalOrderTotalVo.setServiceTotal(0);
mgtTotalOrderTotalVo.setItemTotal(0);
+ mgtTotalOrderTotalVo.setMeituan(0);
+ mgtTotalOrderTotalVo.setDouyin(0);
+ mgtTotalOrderTotalVo.setKuaishou(0);
+ mgtTotalOrderTotalVo.setMeituanAmount(new BigDecimal("0"));
+ mgtTotalOrderTotalVo.setDouyinAmount(new BigDecimal("0"));
+ mgtTotalOrderTotalVo.setKuaishouAmount(new BigDecimal("0"));
mgtTotalOrderTotalVo.setOrderMoney(new BigDecimal("0"));
mgtTotalOrderTotalVo.setOnlineMoney(new BigDecimal("0"));
mgtTotalOrderTotalVo.setOfflineMoney(new BigDecimal("0"));
@@ -4041,6 +5011,12 @@
mgtTotalOrderTotalVo.setOnlineMoney(totalOrderTotalVo.getOnlineMoney());
mgtTotalOrderTotalVo.setOfflineMoney(totalOrderTotalVo.getOfflineMoney());
mgtTotalOrderTotalVo.setActivityMoney(totalOrderTotalVo.getActivityMoney());
+ mgtTotalOrderTotalVo.setMeituan(totalOrderTotalVo.getMeituan());
+ mgtTotalOrderTotalVo.setDouyin(totalOrderTotalVo.getDouyin());
+ mgtTotalOrderTotalVo.setKuaishou(totalOrderTotalVo.getKuaishou());
+ mgtTotalOrderTotalVo.setMeituanAmount(totalOrderTotalVo.getMeituanAmount());
+ mgtTotalOrderTotalVo.setDouyinAmount(totalOrderTotalVo.getDouyinAmount());
+ mgtTotalOrderTotalVo.setKuaishouAmount(totalOrderTotalVo.getKuaishouAmount());
//获取商品分类销售数据
List<MgtMapTotalPlusVo> MgtMapIntTotalVoGoodsType = orderMapper.listPlTotalOrderTotalGoodsType(mgtBasePlatformDto);
List<MgtMapIntTotalVo> goodsTypeTotalList = new ArrayList<>();
@@ -4064,6 +5040,9 @@
for (int i = 0; i < MgtMapIntTotalVoGoodsType.size(); i++) {
mgtMapIntTotalVo = new MgtMapIntTotalVo();
mgtMapBigTotalVo = new MgtMapBigTotalVo();
+ if(null == MgtMapIntTotalVoGoodsType.get(i).getMapKey()){
+ continue;
+ }
mgtMapIntTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
mgtMapBigTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond());
if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("1")) {
@@ -4147,8 +5126,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天
@@ -4724,17 +5728,17 @@
if (memberGiftRecord.getGiftFrom() == 1) {
BirthdayCard birthdayCard = remoteMemberService.getBirthdayCard().getData();
//判断生日活动状态
- if(birthdayCard!=null&&birthdayCard.getCardStatus()==1){
+ if (birthdayCard != null && birthdayCard.getCardStatus() == 1) {
shop = remoteShopService.getShop(shopId).getData();
//判断指定区域全部店铺
- if(birthdayCard.getAreaFlag()==2&&birthdayCard.getShopFlag()==1&&!StringUtils.checkString(birthdayCard.getDesignatedArea(),shop.getShopCityCode())){
+ if (birthdayCard.getAreaFlag() == 2 && birthdayCard.getShopFlag() == 1 && !StringUtils.checkString(birthdayCard.getDesignatedArea(), shop.getShopCityCode())) {
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
//判断指定店铺
- if(birthdayCard.getShopFlag()==2&&!StringUtils.checkString(birthdayCard.getApplicableShop(),shopId.toString())){
+ if (birthdayCard.getShopFlag() == 2 && !StringUtils.checkString(birthdayCard.getApplicableShop(), shopId.toString())) {
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
- }else{
+ } else {
throw new ServiceException(AppErrorConstant.BIRTHDAY_CARD_ERROR);
}
}
@@ -4743,15 +5747,20 @@
throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
}
+ merVerifyAwardVo.setUserId(member.getUserId());
merVerifyAwardVo.setUserName(member.getRealName());
merVerifyAwardVo.setUserMobile(member.getMobile());
- if (memberGiftRecord.getGiftFrom() == 1) {
- merVerifyAwardVo.setGiftFrom("平台生日卡");
+ if (1 == memberGiftRecord.getPrizeFrom()) {
+ if (memberGiftRecord.getGiftFrom() == 1) {
+ merVerifyAwardVo.setGiftFrom("平台生日卡");
+ } else {
+ merVerifyAwardVo.setGiftFrom("商户生日卡");
+ }
} else {
- merVerifyAwardVo.setGiftFrom("商户生日卡");
+ merVerifyAwardVo.setGiftFrom("平台抽奖");
}
merVerifyAwardVo.setGiftType(memberGiftRecord.getGiftType());
- //礼物类型1优惠券2商品3现金4实物
+ //礼物类型1优惠券2商品3现金4实物5积分
switch (memberGiftRecord.getGiftType()) {
case 1:
merVerifyAwardVo.setGiftName(memberGiftRecord.getCouponName());
@@ -5177,11 +6186,12 @@
@Override
@Transactional
@GlobalTransactional(rollbackFor = Exception.class)
- public void autoCancelOrder(String orderId) {
+ public void autoCancelOrder(String orderId, Integer cancelType) {
//更新订单信息
Order order = this.getById(orderId);
order.setOrderStatus(0);
order.setCancelTime(new Date());
+ order.setCancelType(cancelType);
this.saveOrUpdate(order);
//活动订单回退库存
if (order.getOrderFrom() == 2) {
@@ -5393,11 +6403,12 @@
@Override
@Transactional
@GlobalTransactional(rollbackFor = Exception.class)
- public void refundOrder(String orderId) {
+ public void refundOrder(String orderId, Integer cancelType) {
// 更新订单信息
Order order = this.getById(orderId);
order.setOrderStatus(0);
order.setCancelTime(new Date());
+ order.setCancelType(cancelType);
this.saveOrUpdate(order);
OrderRefund orderRefund = new OrderRefund();
String refundId = IdUtils.simpleUUID();
@@ -6136,64 +7147,39 @@
}
}
- @GlobalTransactional(rollbackFor = Exception.class)
- private void autoTimeCancelOrder(Order order) {
- String orderId = order.getOrderId();
- order.setOrderStatus(0);
- order.setCancelTime(new Date());
- this.saveOrUpdate(order);
- //活动订单回退库存
- if (order.getOrderFrom() == 2) {
- List<OrderGoods> orderGoodsList = orderGoodsService.listByOrderId(orderId);
- if (orderGoodsList != null && !orderGoodsList.isEmpty()) {
- for (OrderGoods orderGoods : orderGoodsList) {
- //redis库存控制极简版
- String goodsLock = "goods_lock_" + order.getActivityId() + "_" + orderGoods.getGoodsId();
- RLock redissonLock = redissonClient.getLock(goodsLock);
- try {
- redissonLock.lock(30, TimeUnit.SECONDS);
- Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId());
- if(null == surpNum){
- surpNum = 0;
- }
- redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId(), surpNum + orderGoods.getBuyNum());
- } finally {
- redissonLock.unlock();
- }
- //改变活动库存
- AGStockChangeDto agStockChangeDto = new AGStockChangeDto();
- agStockChangeDto.setActivityId(order.getActivityId());
- agStockChangeDto.setGoodsId(orderGoods.getGoodsId());
- agStockChangeDto.setChangeType(1);
- agStockChangeDto.setChangeNum(orderGoods.getBuyNum());
- agStockChangeDto.setShopId(order.getShopId());
- agStockChangeDto.setUserId(order.getUserId());
- remoteActivityService.changeActivityStock(agStockChangeDto);
- //删除活动记录
- ActivityRecord activityRecord = new ActivityRecord();
- activityRecord.setActivityId(order.getActivityId());
- activityRecord.setGoodsId(orderGoods.getGoodsId());
- activityRecord.setUserId(order.getUserId());
- activityRecord.setOrderTime(order.getCreateTime());
- remoteActivityService.delActivityRecord(activityRecord);
- }
- }
- } else {
- if (order.getCouponMoney().compareTo(BigDecimal.ZERO) > 0) {
- //回退优惠券
- List<OrderGoods> orderGoodsList = orderGoodsService.listByOrderId(orderId);
- if (orderGoodsList != null && !orderGoodsList.isEmpty()) {
- StringJoiner memberCouponSJ = new StringJoiner(",");
- for (OrderGoods orderGoods : orderGoodsList) {
- memberCouponSJ.add(orderGoods.getCouponId());
- }
- if (memberCouponSJ != null) {
- remoteCouponService.backMemberCoupon(memberCouponSJ.toString());
-
- }
- }
- }
+ /**
+ * 后台取消订单
+ * 订单状态变为已取消 不退款
+ * @param dto
+ */
+ @Override
+ public R cancelOrderBySys(CancelOrderDTO dto) {
+ Order order = this.getById(dto.getOrderId());
+ // 订单状态-1.删除 0.已取消 1.待支付 2.待核销 3.已完成
+ if(null == order || order.getDelFlag() == -1){
+ return R.fail("订单不存在");
}
+
+ if (order.getOrderStatus() == 0) {
+ return R.fail(AppErrorConstant.CANCEL_CANCEL_ORDER);
+ } else if (order.getOrderStatus() == 1) {
+ //删除待支付超时取消延时任务
+ redisService.deleteObject(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + order.getOrderId());
+ remoteConfigService.deleteDelayTask(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode()+"-"+order.getOrderId());
+ order.setOrderStatus(0);
+ order.setCancelTime(new Date());
+ order.setCancelType(1);
+ this.saveOrUpdate(order);
+ } else if (order.getOrderStatus() == 2) {
+ // 2.待核销
+ order.setOrderStatus(0);
+ order.setCancelTime(new Date());
+ order.setCancelType(1);
+ this.saveOrUpdate(order);
+ } else {
+ return R.fail(AppErrorConstant.CANCEL_ERROR_ORDER);
+ }
+ return R.ok();
}
/**
@@ -6276,7 +7262,11 @@
*/
@Override
public MerHomeShopTotalVo getShopServiceTotal(Long shopId){
- MerHomeShopTotalVo serviceTotalVo = orderMapper.getMerHomeShopServiceTotalVo(shopId);
+ List<Long> userIds = remoteMemberService.listUserIdByShopId(Arrays.asList(shopId)).getData();
+ if(userIds.isEmpty()){
+ userIds.add(0L);
+ }
+ MerHomeShopTotalVo serviceTotalVo = orderMapper.getMerHomeShopServiceTotalVo(shopId, userIds);
return serviceTotalVo;
}
@@ -6334,4 +7324,203 @@
}
return new ArrayList<>();
}
+
+ @Override
+ public R refundOrderBySys(CancelOrderDTO dto) {
+ Order order = this.getById(dto.getOrderId());
+ // 订单状态-1.删除 0.已取消 1.待支付 2.待核销 3.已完成
+ if(null == order || order.getDelFlag() == -1){
+ return R.fail("订单不存在");
+ }
+ if (order.getOrderStatus() == 0) {
+ return R.fail(AppErrorConstant.CANCEL_CANCEL_ORDER);
+ }else if (order.getOrderStatus() == 1) {
+ //删除待支付超时取消延时任务
+ redisService.deleteObject(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + order.getOrderId());
+ remoteConfigService.deleteDelayTask(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode()+"-"+ order.getOrderId());
+ this.autoCancelOrder( order.getOrderId(), 1);
+ } else if (order.getOrderStatus() == 2) {
+ // 2.待核销 -> 订单退款
+ this.refundOrder( order.getOrderId(), 1);
+ } else {
+ return R.fail("已核销订单不能退款");
+ }
+ return R.ok();
+
+ }
+
+ @GlobalTransactional(rollbackFor = Exception.class)
+ private void autoTimeCancelOrder(Order order) {
+ String orderId = order.getOrderId();
+ order.setOrderStatus(0);
+ order.setCancelTime(new Date());
+ order.setCancelType(1);
+ this.saveOrUpdate(order);
+ //活动订单回退库存
+ if (order.getOrderFrom() == 2) {
+ List<OrderGoods> orderGoodsList = orderGoodsService.listByOrderId(orderId);
+ if (orderGoodsList != null && !orderGoodsList.isEmpty()) {
+ for (OrderGoods orderGoods : orderGoodsList) {
+ //redis库存控制极简版
+ String goodsLock = "goods_lock_" + order.getActivityId() + "_" + orderGoods.getGoodsId();
+ RLock redissonLock = redissonClient.getLock(goodsLock);
+ try {
+ redissonLock.lock(30, TimeUnit.SECONDS);
+ Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId());
+ if(null == surpNum){
+ surpNum = 0;
+ }
+ redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId(), surpNum + orderGoods.getBuyNum());
+ } finally {
+ redissonLock.unlock();
+ }
+ //改变活动库存
+ AGStockChangeDto agStockChangeDto = new AGStockChangeDto();
+ agStockChangeDto.setActivityId(order.getActivityId());
+ agStockChangeDto.setGoodsId(orderGoods.getGoodsId());
+ agStockChangeDto.setChangeType(1);
+ agStockChangeDto.setChangeNum(orderGoods.getBuyNum());
+ agStockChangeDto.setShopId(order.getShopId());
+ agStockChangeDto.setUserId(order.getUserId());
+ remoteActivityService.changeActivityStock(agStockChangeDto);
+ //删除活动记录
+ ActivityRecord activityRecord = new ActivityRecord();
+ activityRecord.setActivityId(order.getActivityId());
+ activityRecord.setGoodsId(orderGoods.getGoodsId());
+ activityRecord.setUserId(order.getUserId());
+ activityRecord.setOrderTime(order.getCreateTime());
+ remoteActivityService.delActivityRecord(activityRecord);
+ }
+ }
+ } else {
+ if (order.getCouponMoney().compareTo(BigDecimal.ZERO) > 0) {
+ //回退优惠券
+ List<OrderGoods> orderGoodsList = orderGoodsService.listByOrderId(orderId);
+ if (orderGoodsList != null && !orderGoodsList.isEmpty()) {
+ StringJoiner memberCouponSJ = new StringJoiner(",");
+ for (OrderGoods orderGoods : orderGoodsList) {
+ memberCouponSJ.add(orderGoods.getCouponId());
+ }
+ if (memberCouponSJ != null) {
+ remoteCouponService.backMemberCoupon(memberCouponSJ.toString());
+
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public List<MgtThirdOrderPageVo> pageMgtThirdOrder(Page<MgtThirdOrderPageVo> page, MgtThirdOrderPageDto dto) {
+ //如果区域代码不为null获取对应的商户id
+ if (StringUtils.isNotBlank(dto.getKeyword()) || StringUtils.isNotBlank(dto.getShopProvinceCode()) || StringUtils.isNotBlank(dto.getShopCityCode()) || StringUtils.isNotBlank(dto.getShopAreaCode())) {
+ MgtShopIdByCodeDto mgtShopIdByCodeDto = new MgtShopIdByCodeDto();
+ mgtShopIdByCodeDto.setShopProvinceCode(dto.getShopProvinceCode());
+ mgtShopIdByCodeDto.setShopCityCode(dto.getShopCityCode());
+ mgtShopIdByCodeDto.setShopAreaCode(dto.getShopAreaCode());
+ MgtShopIdByCodeVo mgtShopIdByCodeVo = remoteShopService.getShopIdByCode(mgtShopIdByCodeDto).getData();
+ if (StringUtils.isNotBlank(mgtShopIdByCodeVo.getShopIds())) {
+ dto.setShopIds(mgtShopIdByCodeVo.getShopIds());
+ }
+ }
+ //如果关键词不为null获取对应的用户id
+ if (StringUtils.isNotBlank(dto.getKeyword())) {
+ MgtUserIdByKeywordDto mgtUserIdByKeywordDto = new MgtUserIdByKeywordDto();
+ mgtUserIdByKeywordDto.setKeyword(dto.getKeyword());
+ MgtUserIdByKeywordVo mgtUserIdByKeywordVo = remoteMemberService.getUserIdByKeyword(mgtUserIdByKeywordDto).getData();
+ if (StringUtils.isNotBlank(mgtUserIdByKeywordVo.getUserIds())) {
+ dto.setUserIds(mgtUserIdByKeywordVo.getUserIds());
+ }
+ }
+ //数据权限
+ List<Long> userId = remoteUserService.getScopeOfAuthorityUserId();
+ BoardMemberTotalDto boardMemberTotalDto = new BoardMemberTotalDto();
+ boardMemberTotalDto.setUserIds(userId);
+ List<Shop> shops = remoteShopService.getShopBySysUserIds(boardMemberTotalDto);
+ if (!shops.isEmpty()) {
+ List<Long> collect = shops.stream().map(Shop::getShopId).collect(Collectors.toList());
+ String join = collect.stream().map(Object::toString).collect(Collectors.joining(","));
+ String shopIds = dto.getShopIds();
+ if(StringUtils.isNotEmpty(shopIds)){
+ shopIds = shopIds + "," + join;
+ }else{
+ shopIds = join;
+ }
+ dto.setShopIds(shopIds);
+ }
+
+ // 从数据库中获取第三方订单列表
+ List<MgtThirdOrderPageVo> thirdOrderPageVoList = orderMapper.pageMgtThirdOrder(page, dto);
+ // 如果列表不为空
+ if (!thirdOrderPageVoList.isEmpty()) {
+ // 定义变量
+ HashSet<Long> shopIdSet = new HashSet<>();
+ BigDecimal zeroBig = new BigDecimal("0.00");
+ // 遍历列表，获取店铺 ID 和用户 ID
+ for (MgtThirdOrderPageVo mgtActivityOrderPageVo : thirdOrderPageVoList) {
+ if(mgtActivityOrderPageVo.getShopId()!=null){
+ shopIdSet.add(mgtActivityOrderPageVo.getShopId());
+ }
+ }
+ // 将店铺 ID 和用户 ID 转换为逗号分隔的字符串
+ String shopJoinedString = String.join(",", shopIdSet.stream().map(Object::toString).collect(Collectors.toList()));
+ // 从远程服务获取店铺和用户信息
+ MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto();
+ mgtBaseBathDto.setIds(shopJoinedString);
+ List<MgtSimpleShopVo> simpleShopVoList = remoteShopService.listShopSimpleVoByIds(mgtBaseBathDto).getData();
+ Map<Long, MgtSimpleShopVo> shopMap = simpleShopVoList.stream()
+ .collect(Collectors.toMap(MgtSimpleShopVo::getShopId, Function.identity()));
+ mgtBaseBathDto = new MgtBaseBathDto();
+ // 遍历列表，设置店铺名称
+ for (MgtThirdOrderPageVo mgtActivityOrderPageVo : thirdOrderPageVoList) {
+ if(mgtActivityOrderPageVo.getShopId()!=null){
+ MgtSimpleShopVo mgtSimpleShopVo = shopMap.get(mgtActivityOrderPageVo.getShopId());
+ mgtActivityOrderPageVo.setShopName(null == mgtSimpleShopVo ? "" : mgtSimpleShopVo.getShopName());
+ }
+ }
+ }
+
+ return thirdOrderPageVoList;
+
+ }
+
+ @Override
+ public MgtPlTotalThirdOrderStaticsVO getPlTotalThirdOrderStatics(MgtBasePlatformDto mgtBasePlatformDto) {
+ MgtPlTotalThirdOrderStaticsVO vo = new MgtPlTotalThirdOrderStaticsVO();
+ //数据权限
+ List<Long> userIdList = mgtBasePlatformDto.getUserIdList();
+ List<Long> userIds = remoteUserService.getScopeOfAuthorityUserId();
+ if(null != userIds){
+ if(null != userIdList){
+ userIdList.addAll(userIds);
+ }else{
+ userIdList = userIds;
+ }
+ mgtBasePlatformDto.setUserIdList(userIdList);
+ }
+ List<Long> shopIdList = remoteShopService.listShopIdByPlTotal(mgtBasePlatformDto).getData();
+ if (mgtBasePlatformDto.getUserId() != null || StringUtils.isNotBlank(mgtBasePlatformDto.getShopProvinceCode()) || StringUtils.isNotBlank(mgtBasePlatformDto.getShopCityCode()) || StringUtils.isNotBlank(mgtBasePlatformDto.getShopAreaCode())) {
+ if(shopIdList==null||shopIdList.isEmpty()){
+ return vo;
+ }
+ }
+ if(mgtBasePlatformDto.getShopId()!=null){
+ shopIdList = new ArrayList<>();
+ shopIdList.add(mgtBasePlatformDto.getShopId());
+ }
+ 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;
+ }
+
+ @Override
+ public StaticsShopMgtGoodsVO getGoodsSellStatic(List<String> goodsIdList) {
+ return orderGoodsService.getGoodsSellStatic(goodsIdList);
+ }
}
--
Gitblit v1.7.1