java/HongRuiTang.git

			@@ -1,10 +1,21 @@
			package com.ruoyi.order.service.impl.order;


			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			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.github.binarywang.wxpay.bean.ecommerce.*;
			import com.github.binarywang.wxpay.bean.ecommerce.ProfitSharingRequest.Receiver;
			import com.github.binarywang.wxpay.bean.ecommerce.enums.TradeTypeEnum;
			import com.github.binarywang.wxpay.bean.profitsharingV3.ProfitSharingNotifyResult;
			import com.github.binarywang.wxpay.config.WxPayConfig;
			import com.github.binarywang.wxpay.exception.WxPayException;
			import com.github.binarywang.wxpay.service.WxPayService;
			import com.google.common.base.Joiner;
			import com.google.gson.Gson;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.exception.ServiceException;
			import com.ruoyi.common.core.utils.DateUtils;
			import com.ruoyi.common.core.utils.StringUtils;
			@@ -12,15 +23,23 @@
			import com.ruoyi.common.redis.service.RedisService;
			import com.ruoyi.common.security.utils.CodeFactoryUtil;
			import com.ruoyi.common.security.utils.SecurityUtils;
			import com.ruoyi.order.config.WxPayConfiguration;
			import com.ruoyi.order.domain.dto.*;
			import com.ruoyi.order.domain.pojo.account.OrderPayment;
			import com.ruoyi.order.domain.pojo.account.OrderRefund;
			import com.ruoyi.order.domain.pojo.account.ProfitSharing;
			import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
			import com.ruoyi.order.domain.pojo.order.Order;
			import com.ruoyi.order.domain.pojo.order.OrderGoods;
			import com.ruoyi.order.domain.pojo.order.PayRecord;
			import com.ruoyi.order.domain.vo.*;
			import com.ruoyi.order.enums.RefundStatusEnum;
			import com.ruoyi.order.enums.dict.IDict;
			import com.ruoyi.order.mapper.order.OrderMapper;
			import com.ruoyi.order.service.account.OrderPaymentService;
			import com.ruoyi.order.service.account.OrderRefundService;
			import com.ruoyi.order.service.account.PaymentMessageService;
			import com.ruoyi.order.service.account.ProfitSharingService;
			import com.ruoyi.order.service.order.*;
			import com.ruoyi.system.api.constant.AppErrorConstant;
			import com.ruoyi.system.api.constant.DelayTaskEnum;
			@@ -35,10 +54,11 @@
			import com.ruoyi.system.api.domain.poji.member.MemberCoupon;
			import com.ruoyi.system.api.domain.poji.member.MemberGiftRecord;
			import com.ruoyi.system.api.domain.poji.shop.Shop;
			import com.ruoyi.system.api.domain.poji.shop.ShopProportionVo;
			import com.ruoyi.system.api.domain.poji.sys.SysUser;
			import com.ruoyi.system.api.domain.vo.*;
			import com.ruoyi.system.api.service.*;
			import com.wechat.pay.java.service.partnerpayments.jsapi.model.Transaction;
			import lombok.extern.slf4j.Slf4j;
			import org.redisson.api.RLock;
			import org.redisson.api.RedissonClient;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -47,6 +67,7 @@

			import javax.annotation.Resource;
			import java.math.BigDecimal;
			import java.math.RoundingMode;
			import java.time.LocalDate;
			import java.time.format.DateTimeFormatter;
			import java.util.*;
			@@ -63,6 +84,7 @@
			* @since 2023-04-25
			*/
			@Service
			@Slf4j
			public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {

			@Resource
			@@ -110,22 +132,20 @@
			@Autowired
			private RedissonClient redissonClient;

			/** 商户号 */
			public static String merchantId = "";
			/** 商户API私钥路径 */
			public static String privateKeyPath = "";
			/** 商户证书序列号 */
			public static String merchantSerialNumber = "";
			/** 微信支付平台证书路径 */
			public static String wechatPayCertificatePath = "";
			/** 微信支付 APIv3 密钥 */
			public static String apiV3Key = "";
			/** 微信支付APPID */
			public static String appId="";
			/** 微信支付商户ID */
			public static String mchId="";
			/** 通知地址 */
			public static String notifyUrl="";
			@Autowired
			private WxPayService wxService;

			@Resource
			private PaymentMessageService paymentMessageService;

			@Resource
			private OrderPaymentService orderPaymentService;

			@Resource
			private ProfitSharingService profitSharingService;

			@Resource
			private OrderRefundService orderRefundService;

			/**
			* @description: buyGoods
			@@ -153,8 +173,8 @@
			Map<String, Goods> goodsMap = goodsList.stream()
			.collect(Collectors.toMap(Goods::getGoodsId, Function.identity()));
			Boolean haveDeposit = false;
			for(Goods goods : goodsList){
			if(goods.getSubscription()!=null&&goods.getSubscription().compareTo(BigDecimal.ZERO)>0){
			for (Goods goods : goodsList) {
			if (goods.getSubscription() != null && goods.getSubscription().compareTo(BigDecimal.ZERO) > 0) {
			haveDeposit = true;
			}
			}
			@@ -174,7 +194,7 @@

			// 将优惠券列表转换为Map，以优惠券ID为键
			Map<String, AppMemberCouponVo> appMemberCouponVoMap = new HashMap<>();
			if(appMemberCouponVoList!=null&&!appMemberCouponVoList.isEmpty()){
			if (appMemberCouponVoList != null && !appMemberCouponVoList.isEmpty()) {
			appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
			}
			AppMemberCouponVo appMemberCouponVo;
			@@ -201,7 +221,7 @@
			memberCouponId = appBuyGoodsDto.getMemberCouponId();
			// 获取商品信息
			goods = goodsMap.get(goodsId);
			if(goods.getGoodsStatus()!=1){
			if (goods.getGoodsStatus() != 1) {
			throw new ServiceException(AppErrorConstant.GOODS_DOWN);
			}
			// 设置订单商品信息
			@@ -234,7 +254,7 @@
			if (couponType == 1 && appMemberCouponVo.getMoneyThreshold() != null && appMemberCouponVo.getDiscountMoney() != null) {
			moneyThreshold = appMemberCouponVo.getMoneyThreshold();
			discountMoney = appMemberCouponVo.getDiscountMoney();
			if (goodsTotalPrice.compareTo(moneyThreshold) >= 0 && goodsTotalPrice.compareTo(discountMoney)>0) {
			if (goodsTotalPrice.compareTo(moneyThreshold) >= 0 && goodsTotalPrice.compareTo(discountMoney) > 0) {
			goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
			useCoupon = 1;
			userCouponIdSet.add(memberCouponId);
			@@ -242,16 +262,16 @@
			}
			} else if (couponType == 2 && appMemberCouponVo.getDiscountPercent() != null) {
			discountPercent = appMemberCouponVo.getDiscountPercent();
			goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN,2,BigDecimal.ROUND_HALF_UP);
			goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN, 2, BigDecimal.ROUND_HALF_UP);
			discountMoney = goodsTotalPrice.subtract(goodsRealPrice);
			useCoupon = 1;
			userCouponIdSet.add(memberCouponId);
			appSureOrderGoodsVo.setMemberCouponId(memberCouponId);
			} else if (couponType == 3 && appMemberCouponVo.getDiscountMoney() != null) {
			discountMoney = appMemberCouponVo.getDiscountMoney();
			if(goodsTotalPrice.compareTo(discountMoney)>0){
			if (goodsTotalPrice.compareTo(discountMoney) > 0) {
			goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
			if(goodsRealPrice.compareTo(BigDecimal.ZERO)<0){
			if (goodsRealPrice.compareTo(BigDecimal.ZERO) < 0) {
			goodsRealPrice = BigDecimal.ZERO;
			}
			useCoupon = 1;
			@@ -267,12 +287,12 @@
			appSureOrderGoodsVo.setGoodsRealPrice(goodsRealPrice);
			// 获取商品押金
			goodsDeposit = goods.getSubscription();
			if (goodsDeposit != null && goodsDeposit.compareTo(BigDecimal.ZERO)>0) {
			if (goodsDeposit != null && goodsDeposit.compareTo(BigDecimal.ZERO) > 0) {
			goodsDeposit = goodsDeposit.multiply(buyNumBig);
			}else{
			if(haveDeposit){
			} else {
			if (haveDeposit) {
			goodsDeposit = goodsRealPrice;
			}else{
			} else {
			goodsDeposit = new BigDecimal("0.00");
			}
			}
			@@ -287,9 +307,9 @@
			//处理优惠券列表
			if (appMemberCouponVoList != null && !appMemberCouponVoList.isEmpty()) {
			for (AppMemberCouponVo entity : appMemberCouponVoList) {
			if(userCouponIdSet!=null&&userCouponIdSet.contains(entity.getMemberCouponId())){
			if (userCouponIdSet != null && userCouponIdSet.contains(entity.getMemberCouponId())) {
			entity.setUseFlag(1);
			}else{
			} else {
			entity.setUseFlag(0);
			}

			@@ -297,18 +317,18 @@
			}
			// 过滤商品优惠券列表
			List<AppMemberCouponVo> appGoodsMemberCouponVoList;
			for(AppSureOrderGoodsVo sureOrderGoodsVo : appSureOrderGoodsVoList) {
			for (AppSureOrderGoodsVo sureOrderGoodsVo : appSureOrderGoodsVoList) {
			appGoodsMemberCouponVoList = new ArrayList<>();
			for(AppMemberCouponVo entity : appMemberCouponVoList){
			if(StringUtils.isBlank(entity.getRelGoodsIds())\|\|entity.getRelGoodsIds().contains(sureOrderGoodsVo.getGoodsId())){
			if(entity.getCouponType()==1){
			if(entity.getMoneyThreshold().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0&&entity.getDiscountMoney().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0){
			for (AppMemberCouponVo entity : appMemberCouponVoList) {
			if (StringUtils.isBlank(entity.getRelGoodsIds()) \|\| entity.getRelGoodsIds().contains(sureOrderGoodsVo.getGoodsId())) {
			if (entity.getCouponType() == 1) {
			if (entity.getMoneyThreshold().compareTo(sureOrderGoodsVo.getGoodsTotalPrice()) < 0 && entity.getDiscountMoney().compareTo(sureOrderGoodsVo.getGoodsTotalPrice()) < 0) {
			appGoodsMemberCouponVoList.add(entity);
			}
			}else if(entity.getCouponType()==2){
			} else if (entity.getCouponType() == 2) {
			appGoodsMemberCouponVoList.add(entity);
			}else if(entity.getCouponType()==3){
			if(entity.getDiscountMoney().compareTo(sureOrderGoodsVo.getGoodsTotalPrice())<0){
			} else if (entity.getCouponType() == 3) {
			if (entity.getDiscountMoney().compareTo(sureOrderGoodsVo.getGoodsTotalPrice()) < 0) {
			appGoodsMemberCouponVoList.add(entity);
			}
			}
			@@ -415,8 +435,8 @@
			if (activityGoodsGetVo.getActivityStatus() == 2) {
			throw new ServiceException(AppErrorConstant.ACTIVITY_END);
			}
			Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+activityId+"-"+goodsId);
			if(surpNum==null\|\|surpNum<1){
			Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + activityId + "-" + goodsId);
			if (surpNum == null \|\| surpNum < 1) {
			throw new ServiceException(AppErrorConstant.ACTIVITY_GOODS_NULL);
			}
			if (activityGoodsGetVo.getAvailableBuyNum() < 1) {
			@@ -426,7 +446,7 @@
			throw new ServiceException(AppErrorConstant.ACTIVITY_GOODS_BEYOND);
			}
			Goods goods = remoteGoodsService.getGoods(goodsId).getData();
			if(goods.getGoodsStatus()!=1){
			if (goods.getGoodsStatus() != 1) {
			throw new ServiceException(AppErrorConstant.GOODS_DOWN);
			}
			appPanicBuyVo.setActivityId(activityId);
			@@ -456,9 +476,9 @@
			appPanicBuyVo.setGoodsTotalPrice(goodsTotalPrice);
			appPanicBuyVo.setGoodsRealPrice(goodsRealPrice);
			goodsDeposit = activityGoodsGetVo.getActivitySubscription();
			if (goodsDeposit == null \|\| goodsDeposit.compareTo(BigDecimal.ZERO)==0) {
			if (goodsDeposit == null \|\| goodsDeposit.compareTo(BigDecimal.ZERO) == 0) {
			goodsDeposit = new BigDecimal("0.00");
			}else{
			} else {
			goodsDeposit = goodsDeposit.multiply(buyNumBig);
			}
			appPanicBuyVo.setGoodsDeposit(goodsDeposit);
			@@ -498,8 +518,8 @@
			Map<String, Goods> goodsMap = goodsList.stream()
			.collect(Collectors.toMap(Goods::getGoodsId, Function.identity()));
			Boolean haveDeposit = false;
			for(Goods goods : goodsList){
			if(goods.getSubscription()!=null&&goods.getSubscription().compareTo(BigDecimal.ZERO)>0){
			for (Goods goods : goodsList) {
			if (goods.getSubscription() != null && goods.getSubscription().compareTo(BigDecimal.ZERO) > 0) {
			haveDeposit = true;
			}
			}
			@@ -510,7 +530,7 @@
			Integer serviceNum;
			Integer goodsNum = 0;
			String memberCouponId;
			Goods goods;
			Goods goods = null;
			GoodsFile goodsFile;
			BigDecimal goodsPrice;
			BigDecimal goodsTotalPrice;
			@@ -542,6 +562,7 @@
			HashSet<String> goodsTypeSet = new HashSet<>();
			//使用优惠券
			StringJoiner memberCouponSJ = new StringJoiner(",");
			List<String> goodsNameList = new ArrayList<>();
			// 遍历购买的商品列表
			for (AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList) {
			appSureOrderGoodsVo = new AppSureOrderGoodsVo();
			@@ -551,6 +572,7 @@
			memberCouponId = appBuyGoodsDto.getMemberCouponId();
			// 获取商品信息
			goods = goodsMap.get(goodsId);
			goodsNameList.add(goods.getGoodsName());
			// 设置商品信息
			appSureOrderGoodsVo.setGoodsId(goodsId);
			appSureOrderGoodsVo.setGoodsName(goods.getGoodsName());
			@@ -596,7 +618,7 @@
			}
			} else if (couponType == 2 && appMemberCouponVo.getDiscountPercent() != null) {
			discountPercent = appMemberCouponVo.getDiscountPercent();
			goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN,2, BigDecimal.ROUND_HALF_UP);
			goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN, 2, BigDecimal.ROUND_HALF_UP);
			discountMoney = goodsTotalPrice.subtract(goodsRealPrice);
			useCoupon = 1;
			} else if (couponType == 3 && appMemberCouponVo.getDiscountMoney() != null) {
			@@ -613,12 +635,12 @@
			appSureOrderGoodsVo.setGoodsRealPrice(goodsRealPrice);
			// 获取商品押金
			goodsDeposit = goods.getSubscription();
			if (goodsDeposit != null && goodsDeposit.compareTo(BigDecimal.ZERO)>0) {
			if (goodsDeposit != null && goodsDeposit.compareTo(BigDecimal.ZERO) > 0) {
			goodsDeposit = goodsDeposit.multiply(buyNumBig);
			}else{
			if(haveDeposit){
			} else {
			if (haveDeposit) {
			goodsDeposit = goodsRealPrice;
			}else{
			} else {
			goodsDeposit = new BigDecimal("0.00");
			}
			}
			@@ -648,6 +670,7 @@
			orderGoods.setServiceNum(serviceNum);
			orderGoods.setGoodsType(goods.getGoodsType());
			orderGoods.setGoodsName(goods.getGoodsName());
			orderGoods.setGoodsTag(goods.getGoodsTags());
			orderGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
			orderGoods.setGoodsPicture(goodsFile.getFileUrl());
			// 保存订单商品
			@@ -713,53 +736,127 @@
			}
			appPlaceOrderVo.setOrderId(orderId);
			appPlaceOrderVo.setOrderNo(orderNo);
			// 调用支付
			/* CombineTransactionsJsRequest request=new CombineTransactionsJsRequest();
			request.setCombineAppid();
			request.setCombineMchid();
			profitsSharingService.combineTransactions(request);*/

			//构建预下单支付对象
			/*PrepayRequest request = new PrepayRequest();
			Amount amount = new Amount();
			amount.setTotal(Integer.parseInt(order.getPayMoney().multiply(new BigDecimal(100)).toString()));
			request.setAmount(amount);
			request.setAppid(this.appId);
			request.setMchid(this.mchId);
			request.setDescription(order.getGoodsInfo());
			request.setNotifyUrl(this.notifyUrl);
			request.setOutTradeNo(order.getOrderId());
			Payer payer = new Payer();
			payer.setOpenid("oLTPCuN5a-nBD4rAL_fa********");
			request.setPayer(payer);*/
			//返回前端唤醒支付结果信息
			/*PrepayWithRequestPaymentResponse res = this.getJsApIResponse(request);
			appPlaceOrderVo.setAppId(this.appId);
			appPlaceOrderVo.setTimeStamp(res.getTimeStamp());
			appPlaceOrderVo.setNonceStr(res.getNonceStr());
			appPlaceOrderVo.setPackageStr(res.getPackageVal());
			appPlaceOrderVo.setTradeType(res.getSignType());
			appPlaceOrderVo.setPaySign(res.getPaySign());*/
			String goodsName = "";
			if (null != goods) {
			goodsName = goods.getGoodsName();
			}

			// 小程序微信下单支付
			createWxPayInfo(appPlaceOrderVo, userId, order.getShopId(), goodsName, orderNo,
			orderId, order.getPayMoney(), appPlaceOrderDto.getOpenid(),
			appPlaceOrderDto.getSpbillCreateIp(), goodsNameList);


			//减去优惠券
			if(memberCouponSJ!=null&&StringUtils.isNotBlank(memberCouponSJ.toString())){
			if (StringUtils.isNotBlank(memberCouponSJ.toString())) {
			remoteCouponService.useMemberCoupon(memberCouponSJ.toString());
			}
			//生成自动取消订单延时任务
			Integer delayTime = 30;
			if(redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)){
			if (redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)) {
			delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME);
			}
			redisService.setCacheObject(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + orderId, orderId, delayTime.longValue(), TimeUnit.MINUTES);
			DelayTask delayTask = new DelayTask();
			delayTask.setDelFlag(0);
			delayTask.setCreateTime(new Date());
			delayTask.setEndTime(DateUtils.addMinutes(new Date(),delayTime));
			delayTask.setEndTime(DateUtils.addMinutes(new Date(), delayTime));
			delayTask.setRedisKey(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + orderId);
			remoteConfigService.addDelayTask(delayTask);
			appPlaceOrderVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(),delayTime));
			appPlaceOrderVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(), delayTime));

			return appPlaceOrderVo;
			}

			/**
			* 小程序支付下单API
			* @param appPlaceOrderVo
			* @param userId
			* @param shopId
			* @param goodsName
			* @param orderNo
			* @param orderId
			* @param payMoney
			* @param openid
			* @param payerClientIp
			* @param goodsNameList
			*/
			private void createWxPayInfo(AppPlaceOrderVo appPlaceOrderVo, Long userId, Long shopId,
			String goodsName, String orderNo,
			String orderId, BigDecimal payMoney,
			String openid, String payerClientIp, List<String> goodsNameList){
			try {
			// 创建支付订单
			R<String> resultMch = remoteShopService.getShopSubMchId(shopId);
			String subMchId = resultMch.getData();
			if (StringUtils.isEmpty(subMchId)) {
			throw new ServiceException("获取微信商户号失败");
			}
			WxPayConfig config = wxService.getConfig();
			config.setSubMchId(subMchId);

			PartnerTransactionsRequest request = new PartnerTransactionsRequest();
			request.setSpAppid(config.getAppId());
			request.setSpMchid(config.getMchId());
			request.setSubMchid(config.getSubMchId());
			// 商品描述 body
			String description = goodsName + "-商品购买";

			request.setDescription(description);
			request.setOutTradeNo(orderNo);
			request.setNotifyUrl(config.getNotifyUrl());
			// 结算信息
			PartnerTransactionsRequest.SettleInfo settleInfo = new PartnerTransactionsRequest.SettleInfo();
			settleInfo.setProfitSharing(true);
			settleInfo.setSubsidyAmount(BigDecimal.ZERO);
			request.setSettleInfo(settleInfo);

			// 订单总金额
			Integer totalFee = payMoney.multiply(new BigDecimal(100)).intValue();
			PartnerTransactionsRequest.Amount amount = new PartnerTransactionsRequest.Amount();
			amount.setTotal(totalFee);
			amount.setCurrency("CNY");
			request.setAmount(amount);

			// 支付者
			PartnerTransactionsRequest.Payer payer = new PartnerTransactionsRequest.Payer();
			payer.setSpOpenid(openid);
			request.setPayer(payer);

			// 场景信息
			PartnerTransactionsRequest.SceneInfo sceneInfo = new PartnerTransactionsRequest.SceneInfo();
			sceneInfo.setPayerClientIp(payerClientIp);
			request.setSceneInfo(sceneInfo);

			TransactionsResult.JsapiResult result = wxService.getEcommerceService().partnerTransactions(TradeTypeEnum.JSAPI, request);

			// 请求参数
			Gson gson = new Gson();
			String payRequestJson = gson.toJson(request);
			// 返回参数
			String payResponseJson = gson.toJson(result);

			// 支付相关信息返回
			appPlaceOrderVo.setAppId(result.getAppId());
			appPlaceOrderVo.setMchId(config.getMchId());
			appPlaceOrderVo.setTimeStamp(result.getTimeStamp());
			appPlaceOrderVo.setNonceStr(result.getNonceStr());
			appPlaceOrderVo.setPackageStr(result.getPackageValue());
			appPlaceOrderVo.setSignType(result.getSignType());
			appPlaceOrderVo.setPaySign(result.getPaySign());
			appPlaceOrderVo.setPrepayId(result.getPackageValue());

			// 保存支付订单统一下单日志
			paymentMessageService.savePaymentMessage("1", orderId, payRequestJson, payResponseJson);

			// 保存支付订单统一下单支付记录
			orderPaymentService.saveOrderPayment(userId, shopId, subMchId, orderId, payMoney,
			appPlaceOrderVo.getEndTime(), "Y", openid,
			Joiner.on(";").join(goodsNameList), result.getPackageValue());
			} catch (WxPayException e) {
			throw new ServiceException(e.getMessage());
			}
			}


			@@ -783,17 +880,17 @@
			String goodsId = appPlaceActivityDto.getGoodsId();
			Integer buyNum = appPlaceActivityDto.getBuyNum();
			//redis库存控制极简版
			String goodsLock = "goods_lock_"+activityId+"_"+goodsId;
			String goodsLock = "goods_lock_" + activityId + "_" + goodsId;
			RLock redissonLock = redissonClient.getLock(goodsLock);
			try{
			try {
			redissonLock.lock(30, TimeUnit.SECONDS);
			Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+activityId+"-"+goodsId);
			if(surpNum==null\|\|surpNum<buyNum){
			Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + activityId + "-" + goodsId);
			if (surpNum == null \|\| surpNum < buyNum) {
			throw new ServiceException(AppErrorConstant.ACTIVITY_GOODS_NULL);
			}else{
			redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+activityId+"-"+goodsId,surpNum-buyNum);
			} else {
			redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + activityId + "-" + goodsId, surpNum - buyNum);
			}
			}finally{
			} finally {
			redissonLock.unlock();
			}
			// 定义购买数量，服务数量，商品数量
			@@ -873,9 +970,9 @@
			appSureOrderGoodsVo.setGoodsRealPrice(goodsRealPrice);
			// 获取商品押金
			goodsDeposit = activityGoodsGetVo.getActivitySubscription();
			if (goodsDeposit == null \|\| goodsDeposit.compareTo(BigDecimal.ZERO)==0) {
			if (goodsDeposit == null \|\| goodsDeposit.compareTo(BigDecimal.ZERO) == 0) {
			goodsDeposit = new BigDecimal("0.00");
			}else{
			} else {
			goodsDeposit = goodsDeposit.multiply(buyNumBig);
			}
			appSureOrderGoodsVo.setGoodsDeposit(goodsDeposit);
			@@ -900,6 +997,7 @@
			orderGoods.setCycleNumFlag(goods.getCycleNumFlag());
			orderGoods.setServiceNum(serviceNum);
			orderGoods.setGoodsType(goods.getGoodsType());
			orderGoods.setGoodsTag(goods.getGoodsTags());
			orderGoods.setGoodsName(goods.getGoodsName());
			orderGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
			orderGoods.setGoodsPicture(goodsFile.getFileUrl());
			@@ -921,9 +1019,9 @@
			goodsTypeSet.add("单品");
			}
			String goodsNurse = goods.getGoodsNurses();
			if(StringUtils.isNotBlank(goodsNurse)){
			if (StringUtils.isNotBlank(goodsNurse)) {
			String[] goodsNurseArr = goodsNurse.split(",");
			for(String str : goodsNurseArr){
			for (String str : goodsNurseArr) {
			goodsNurseSet.add(str);
			}
			}
			@@ -967,7 +1065,7 @@
			// 保存订单
			this.save(order);
			// 更新用户商品类型
			if (goodsTypeSet != null \|\| goodsNurseSet!= null) {
			if (goodsTypeSet != null \|\| goodsNurseSet != null) {
			AppMemberGoodsTypeDto appMemberGoodsTypeDto = new AppMemberGoodsTypeDto();
			appMemberGoodsTypeDto.setUserId(userId);
			appMemberGoodsTypeDto.setGoodsTypeSet(goodsTypeSet);
			@@ -1035,17 +1133,17 @@
			remoteActivityService.addActivityRecord(activityRecord);
			//生成自动取消订单延时任务
			Integer delayTime = 30;
			if(redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)){
			if (redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)) {
			delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME);
			}
			redisService.setCacheObject(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + orderId, orderId, delayTime.longValue(), TimeUnit.MINUTES);
			DelayTask delayTask = new DelayTask();
			delayTask.setDelFlag(0);
			delayTask.setCreateTime(new Date());
			delayTask.setEndTime(DateUtils.addMinutes(new Date(),delayTime));
			delayTask.setEndTime(DateUtils.addMinutes(new Date(), delayTime));
			delayTask.setRedisKey(DelayTaskEnum.ORDER_AUTOMATIC_CANCEL.getCode() + "-" + orderId);
			remoteConfigService.addDelayTask(delayTask);
			appPlaceOrderVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(),delayTime));
			appPlaceOrderVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(), delayTime));
			return appPlaceOrderVo;
			}

			@@ -1074,7 +1172,7 @@
			shopMap.put(shopIdLong, shopTemp);
			});
			Integer delayTime = 30;
			if(redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)){
			if (redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)) {
			delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME);
			}
			for (AppUserOrderPageVo appUserOrderPageVo : appUserOrderPageVoList) {
			@@ -1087,7 +1185,7 @@
			appUserOrderPageVo.setSameShop(0);
			}
			appUserOrderPageVo.setVerifyCode("1-" + appUserOrderPageVo.getOrderId());
			appUserOrderPageVo.setEndTime(DateUtils.addMinutes(appUserOrderPageVo.getCreateTime(),delayTime));
			appUserOrderPageVo.setEndTime(DateUtils.addMinutes(appUserOrderPageVo.getCreateTime(), delayTime));
			}
			}
			return appUserOrderPageVoList;
			@@ -1128,10 +1226,10 @@
			appUserOrderGetVo.setVerifyCode("1-" + orderId);
			//生成自动取消订单延时任务
			Integer delayTime = 30;
			if(redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)){
			if (redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)) {
			delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME);
			}
			appUserOrderGetVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(),delayTime));
			appUserOrderGetVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(), delayTime));
			return appUserOrderGetVo;
			}

			@@ -1143,13 +1241,15 @@
			@Override
			public void cancelOrder(String orderId) {
			Order order = this.getById(orderId);
			// 订单状态-1.删除 0.已取消 1.待支付 2.待核销 3.已完成
			if (order.getOrderStatus() == 0) {
			throw new ServiceException(AppErrorConstant.CANCEL_CANCEL_ORDER);
			}else if (order.getOrderStatus() == 1) {
			} else if (order.getOrderStatus() == 1) {
			this.autoCancelOrder(orderId);
			}else if(order.getOrderStatus() == 2){
			} else if (order.getOrderStatus() == 2) {
			// 2.待核销 -> 订单退款
			this.refundOrder(orderId);
			}else{
			} else {
			throw new ServiceException(AppErrorConstant.CANCEL_ERROR_ORDER);
			}
			}
			@@ -1224,6 +1324,18 @@
			merVerifyOrderVo.setPayTime(order.getPayTime());
			merVerifyOrderVo.setUseTime(order.getUseTime());
			merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
			merVerifyOrderVo.setPayType(order.getPayType());
			merVerifyOrderVo.setRealReceiveMoney(order.getChangeReceivableMoney());
			if(order.getPayType()==1){
			merVerifyOrderVo.setReceiveMoney(order.getPayMoney());
			}else{
			if(order.getOfflinePayMoney()!=null){
			merVerifyOrderVo.setReceiveMoney(order.getOfflinePayMoney());
			}else{
			merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
			}
			}
			merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(order.getReceivableMoney()));
			// 根据订单用户ID获取用户信息
			Member member = remoteMemberService.getMember(order.getUserId()).getData();
			merVerifyOrderVo.setUserId(order.getUserId());
			@@ -1254,7 +1366,7 @@
			}

			ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyOrderDto.getUserId()).getData();
			if(!shopRelUserVo.getShopId().equals(order.getShopId())){
			if (!shopRelUserVo.getShopId().equals(order.getShopId())) {
			throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
			}
			order.setOrderStatus(3);
			@@ -1264,9 +1376,9 @@
			order.setOffPayTime(nowTime);
			order.setPayMoney(order.getPayMoney().add(relPayMoney));
			order.setChangeReceivableMoney(relReceiveMoney);
			if(order.getPayMoney().compareTo(order.getChangeReceivableMoney())>=0){
			if (order.getPayMoney().compareTo(order.getChangeReceivableMoney()) >= 0) {
			order.setCloseFlag(1);
			}else{
			} else {
			order.setCloseFlag(0);
			}
			this.saveOrUpdate(order);
			@@ -1286,7 +1398,7 @@
			List<ConsumerGoods> consumerGoodsList = new ArrayList<>();
			for (AppUserOrderGoodsPageVo appUserOrderGoodsPageVo : appUserOrderGoodsPageVoList) {
			Integer buyNum = appUserOrderGoodsPageVo.getBuyNum();
			if(appUserOrderGoodsPageVo.getCycleNumFlag()==0){
			if (appUserOrderGoodsPageVo.getCycleNumFlag() == 0) {
			consumerGoods = new ConsumerGoods();
			goods = goodsMap.get(appUserOrderGoodsPageVo.getGoodsId());
			consumerGoodsId = IdUtils.simpleUUID();
			@@ -1303,6 +1415,7 @@
			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());
			@@ -1310,8 +1423,8 @@
			consumerGoods.setSourceFrom(1);
			consumerGoods.setSureNum(buyNum);
			consumerGoodsList.add(consumerGoods);
			}else{
			for(int i=0;i<buyNum;i++){
			} else {
			for (int i = 0; i < buyNum; i++) {
			consumerGoods = new ConsumerGoods();
			goods = goodsMap.get(appUserOrderGoodsPageVo.getGoodsId());
			consumerGoodsId = IdUtils.simpleUUID();
			@@ -1328,6 +1441,7 @@
			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());
			@@ -1354,15 +1468,26 @@
			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.setReceiveMoney(order.getPayMoney());
			}else{
			if(order.getOfflinePayMoney()!=null){
			merVerifyOrderVo.setReceiveMoney(order.getOfflinePayMoney());
			}else{
			merVerifyOrderVo.setReceiveMoney(BigDecimal.ZERO);
			}
			}
			merVerifyOrderVo.setUnReceiveMoney(merVerifyOrderVo.getRealReceiveMoney().subtract(order.getReceivableMoney()));
			Member member = remoteMemberService.getMember(order.getUserId()).getData();
			merVerifyOrderVo.setUserId(order.getUserId());
			merVerifyOrderVo.setUserName(member.getRealName());
			merVerifyOrderVo.setUserMobile(member.getMobile());
			merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
			//
			if(order.getOrderFrom()==2){

			//profitsSharingService.applyProfitSharing();
			if (order.getOrderFrom() == 2) {
			// profitsSharingService.applyProfitSharing();
			}

			//创建支付记录
			@@ -1371,10 +1496,89 @@
			payRecord.setOrderId(order.getOrderId());
			payRecord.setPayMoney(merVerifyOrderDto.getRelPayMoney());
			payRecord.setPayTime(new Date());
			payRecord.setPayType(2);
			payRecord.setPayType(merVerifyOrderDto.getPayType());
			payRecordService.save(payRecord);
			return merVerifyOrderVo;

			submitProfitSharing(orderId, order.getOrderNo(), order.getShopId(), order.getOrderMoney());

			return merVerifyOrderVo;
			}

			private void submitProfitSharing(String orderId, String orderNo, Long shopId, BigDecimal orderMoney) {
			String sendMessage = "";
			String resultMessage = "";
			try {
			// 核销完成开始分账（平台收取服务费）
			OrderPayment payment = orderPaymentService.getByOrderId(orderId);
			String transactionId = payment.getTransactionId();

			// 平台特约商户号，用户平台收取服务费
			String platformTyMacId = WxPayConfiguration.getPlatformTyMacId();

			R<String> resultMch = remoteShopService.getShopSubMchId(shopId);
			String subMchId = resultMch.getData();
			if (!StringUtils.isEmpty(subMchId)) {


			R<ShopProportionVo> resultShopProportion = remoteShopService.getShopProportion(shopId);
			ShopProportionVo shopProportion = resultShopProportion.getData();
			if (null != shopProportion) {
			ProfitSharingRequest request = new ProfitSharingRequest();
			request.setSubMchid(subMchId);
			request.setTransactionId(transactionId);
			request.setOutOrderNo(orderNo);
			List<Receiver> receiverList = new ArrayList<>();

			String description = "订单:" + orderNo + " 平台抽取佣金";
			BigDecimal proportionPercent = shopProportion.getProportionPercent();
			if (null == proportionPercent) {
			proportionPercent = BigDecimal.ZERO;
			}

			ProfitSharingResult result = new ProfitSharingResult();
			result.setOutOrderNo(orderNo);
			result.setStatus("FINISHED");

			// 计算分成金额
			int amount = orderMoney.multiply(proportionPercent).setScale(0, RoundingMode.UP).intValue();
			log.info("订单分账：{} 分账金额: {}", orderNo, amount);
			if (amount > 0) {
			// 分账创建
			Receiver receiver = new Receiver();
			receiver.setType("MERCHANT_ID");
			receiver.setReceiverAccount(platformTyMacId);
			receiver.setAmount(amount);
			receiver.setDescription(description);

			receiverList.add(receiver);
			request.setReceivers(receiverList);
			// 分账完成
			request.setFinish(true);
			result = wxService.getEcommerceService().profitSharing(request);
			}

			// 创建分账记录
			profitSharingService.saveProfitSharing(shopId, orderId, orderMoney, result);

			// 保存请求信息
			sendMessage = JSONObject.toJSONString(request);
			resultMessage = JSONObject.toJSONString(result);
			} else {
			resultMessage = String.format("订单分账：%s 获取商户分成失败", orderNo);
			log.info(resultMessage);
			}
			} else {
			resultMessage = String.format("订单分账：%s 获取微信商户号失败", orderNo);
			log.info(resultMessage);
			}
			} catch (WxPayException e) {
			resultMessage = String.format("订单分账：%s 分账失败：%s", orderNo, e.getMessage());
			log.info(resultMessage);
			e.printStackTrace();
			}

			// 保存分账信息
			paymentMessageService.savePaymentMessage("4", orderId, sendMessage, resultMessage);
			}

			/**
			@@ -1389,7 +1593,7 @@
			public MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto) {
			MerVerifyCouponGetVo verifyCouponGetVo = remoteCouponService.getVerifyCoupon(merVerifyCouponDto.getMemberCouponId()).getData();
			ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyCouponDto.getUserId()).getData();
			if(!shopRelUserVo.getShopId().equals(verifyCouponGetVo.getMemberCoupon().getShopId())){
			if (!shopRelUserVo.getShopId().equals(verifyCouponGetVo.getMemberCoupon().getShopId())) {
			throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
			}
			// 创建MerVerifyCouponVo对象
			@@ -1452,11 +1656,12 @@
			appShopGoodsGetDto.setShopId(memberCoupon.getShopId());
			//获取商户服务次数
			shopGoods = remoteGoodsService.getShopGoods(appShopGoodsGetDto).getData();
			if(shopGoods!=null){
			if (shopGoods != null) {
			consumerGoods.setServiceNum(shopGoods.getServiceNum());
			}
			consumerGoods.setUsedNum(0);
			consumerGoods.setGoodsType(goods.getGoodsType());
			consumerGoods.setGoodsTag(goods.getGoodsTags());
			consumerGoods.setCreateTime(new Date());
			consumerGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
			goodsFile = remoteGoodsService.getGoodsFile(goods.getGoodsId()).getData();
			@@ -1472,36 +1677,36 @@


			/**
			* @description 确认核销奖品
			* @author jqs
			* @date 2023/7/9 9:54
			* @param merVerifyPrizeDto
			* @return MerVerifyAwardVo
			* @return MerVerifyAwardVo
			* @description 确认核销奖品
			* @author jqs
			* @date 2023/7/9 9:54
			*/
			@Override
			@Transactional
			public MerVerifyAwardVo sureVerifyPrize(MerVerifyPrizeDto merVerifyPrizeDto){
			public MerVerifyAwardVo sureVerifyPrize(MerVerifyPrizeDto merVerifyPrizeDto) {
			MerVerifyAwardVo merVerifyAwardVo = new MerVerifyAwardVo();
			MemberGiftRecord memberGiftRecord = remoteMemberService.getVerifyPrize(merVerifyPrizeDto.getPrizeId()).getData();
			if(memberGiftRecord==null\|\|memberGiftRecord.getVerifyStatus()!=1){
			if (memberGiftRecord == null \|\| memberGiftRecord.getVerifyStatus() != 1) {
			throw new ServiceException(AppErrorConstant.COUPON_USED);
			}
			ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyPrizeDto.getUserId()).getData();
			if(!shopRelUserVo.getShopId().equals(memberGiftRecord.getShopId())){
			if (!shopRelUserVo.getShopId().equals(memberGiftRecord.getShopId())) {
			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){
			if (memberGiftRecord.getGiftFrom() == 1) {
			merVerifyAwardVo.setGiftFrom("平台生日卡");
			}else{
			} else {
			merVerifyAwardVo.setGiftFrom("商户生日卡");
			}
			merVerifyAwardVo.setGiftType(memberGiftRecord.getGiftType());
			List<BirthdayGiftSendDto> giftSendDtoList = new ArrayList<>();
			BirthdayGiftSendDto birthdayGiftSendDto = new BirthdayGiftSendDto();
			switch(memberGiftRecord.getGiftType()){
			switch (memberGiftRecord.getGiftType()) {
			case 1:
			merVerifyAwardVo.setGiftName(memberGiftRecord.getCouponName());
			merVerifyAwardVo.setGiftNumber(Double.valueOf(memberGiftRecord.getCouponNumber()));
			@@ -1550,7 +1755,7 @@
			merVerifyAwardVo.setCreateTime(memberGiftRecord.getCreateTime());
			memberGiftRecord.setVerifyStatus(2);
			memberGiftRecord.setVerifyTime(new Date());
			if(member.getBindingFlag()!=1){
			if (member.getBindingFlag() != 1) {
			AppMemberBindingDto appMemberBindingDto = new AppMemberBindingDto();
			appMemberBindingDto.setBindingFlag(1);
			appMemberBindingDto.setShopId(merVerifyPrizeDto.getShopId());
			@@ -1575,7 +1780,7 @@
			@Override
			public List<MerMemberNoClearOrderVo> pageMerMemberNoClearOrder(Page page, MerMemberNoClearOrderDto merMemberNoClearOrderDto) {
			List<MerMemberNoClearOrderVo> merMemberNoClearOrderVoList = orderMapper.pageMerMemberNoClearOrder(page, merMemberNoClearOrderDto.getMemberUserId());
			if (merMemberNoClearOrderVoList != null && !merMemberNoClearOrderVoList.isEmpty()) {
			/*if (merMemberNoClearOrderVoList != null && !merMemberNoClearOrderVoList.isEmpty()) {
			BigDecimal zeroBig = new BigDecimal("0.00");
			for (MerMemberNoClearOrderVo merMemberNoClearOrderVo : merMemberNoClearOrderVoList) {
			merMemberNoClearOrderVo.setUnPaidMoney(merMemberNoClearOrderVo.getReceivableMoney().subtract(merMemberNoClearOrderVo.getPayMoney()));
			@@ -1583,7 +1788,7 @@
			merMemberNoClearOrderVo.setUnPaidMoney(zeroBig);
			}
			}
			}
			}*/
			return merMemberNoClearOrderVoList;
			}

			@@ -1598,9 +1803,9 @@
			order.setOfflinePayMoney(order.getOfflinePayMoney().add(merCloseOrderDto.getPayMoney()));
			order.setOffPayTime(new Date());
			order.setPayMoney(order.getPayMoney().add(merCloseOrderDto.getPayMoney()));
			if(order.getPayMoney().compareTo(order.getChangeReceivableMoney())>=0){
			if (order.getPayMoney().compareTo(order.getChangeReceivableMoney()) >= 0) {
			order.setCloseFlag(0);
			}else{
			} else {
			order.setCloseFlag(1);
			}
			this.saveOrUpdate(order);
			@@ -1610,7 +1815,7 @@
			payRecord.setOrderId(order.getOrderId());
			payRecord.setPayMoney(merCloseOrderDto.getPayMoney());
			payRecord.setPayTime(new Date());
			payRecord.setPayType(2);
			payRecord.setPayType(merCloseOrderDto.getPayType());
			payRecordService.save(payRecord);
			}

			@@ -1731,7 +1936,7 @@
			}
			} else if (couponType == 2 && appMemberCouponVo.getDiscountPercent() != null) {
			discountPercent = appMemberCouponVo.getDiscountPercent();
			goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN,2, BigDecimal.ROUND_HALF_UP);
			goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN, 2, BigDecimal.ROUND_HALF_UP);
			discountMoney = goodsRealPrice.subtract(goodsTotalPrice);
			} else if (couponType == 3 && appMemberCouponVo.getDiscountMoney() != null) {
			discountMoney = appMemberCouponVo.getDiscountMoney();
			@@ -1741,9 +1946,9 @@
			}

			goodsDeposit = goods.getSubscription();
			if (goodsDeposit == null \|\| goodsDeposit.compareTo(BigDecimal.ZERO)==0) {
			if (goodsDeposit == null \|\| goodsDeposit.compareTo(BigDecimal.ZERO) == 0) {
			goodsDeposit = new BigDecimal("0.00");
			}else{
			} else {
			goodsDeposit = goodsDeposit.multiply(buyNumBig);
			}
			goodsNum = goodsNum + buyNum;
			@@ -1768,6 +1973,7 @@
			orderGoods.setCycleNumFlag(goods.getCycleNumFlag());
			orderGoods.setServiceNum(serviceNum);
			orderGoods.setGoodsType(goods.getGoodsType());
			orderGoods.setGoodsTag(goods.getGoodsTags());
			orderGoods.setGoodsName(goods.getGoodsName());
			orderGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
			orderGoods.setGoodsPicture(goodsFile.getFileUrl());
			@@ -1815,7 +2021,6 @@
			order.setOrderRemark(merNewOrderDto.getOrderRemark());
			order.setGoodsNum(goodsNum);
			order.setCreateTime(nowTime);
			order.setPayTime(nowTime);
			order.setUseTime(nowTime);
			order.setUseUserId(merNewOrderDto.getUserId());
			order.setPayMoney(merNewOrderDto.getPayMoney());
			@@ -1823,9 +2028,9 @@
			order.setOfflinePayMoney(merNewOrderDto.getPayMoney());
			order.setOffPayTime(nowTime);
			order.setPayType(1);
			if(order.getPayMoney().compareTo(order.getChangeReceivableMoney())>=0){
			if (order.getPayMoney().compareTo(order.getChangeReceivableMoney()) >= 0) {
			order.setCloseFlag(0);
			}else{
			} else {
			order.setCloseFlag(1);
			}
			this.save(order);
			@@ -1836,7 +2041,7 @@
			List<ConsumerGoods> consumerGoodsList = new ArrayList<>();
			for (AppUserOrderGoodsPageVo appUserOrderGoodsPageVo : appUserOrderGoodsPageVoList) {
			Integer buyGoodsNum = appUserOrderGoodsPageVo.getBuyNum();
			if(appUserOrderGoodsPageVo.getCycleNumFlag()==0){
			if (appUserOrderGoodsPageVo.getCycleNumFlag() == 0) {
			consumerGoods = new ConsumerGoods();
			goods = remoteGoodsService.getGoods(appUserOrderGoodsPageVo.getGoodsId()).getData();
			consumerGoodsId = IdUtils.simpleUUID();
			@@ -1853,6 +2058,7 @@
			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());
			@@ -1860,8 +2066,8 @@
			consumerGoods.setSourceFrom(1);
			consumerGoods.setSureNum(buyGoodsNum);
			consumerGoodsList.add(consumerGoods);
			}else{
			for(int i=0;i<buyGoodsNum;i++) {
			} else {
			for (int i = 0; i < buyGoodsNum; i++) {
			consumerGoods = new ConsumerGoods();
			goods = remoteGoodsService.getGoods(appUserOrderGoodsPageVo.getGoodsId()).getData();
			consumerGoodsId = IdUtils.simpleUUID();
			@@ -1878,6 +2084,7 @@
			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());
			@@ -1923,11 +2130,11 @@
			*/
			@Override
			public List<MerOrderPageVo> pageMerOrder(Page page, MerOrderPageDto merOrderPageDto) {
			if(StringUtils.isNotBlank(merOrderPageDto.getKeyword())){
			if (StringUtils.isNotBlank(merOrderPageDto.getKeyword())) {
			MgtUserIdByKeywordDto userIdByKeywordDto = new MgtUserIdByKeywordDto();
			userIdByKeywordDto.setKeyword(merOrderPageDto.getKeyword());
			MgtUserIdByKeywordVo userIdByKeywordVo = remoteMemberService.getUserIdByKeyword(userIdByKeywordDto).getData();
			if(StringUtils.isNotBlank(userIdByKeywordVo.getUserIds())){
			if (StringUtils.isNotBlank(userIdByKeywordVo.getUserIds())) {
			List<Long> userIdList = Arrays.stream(userIdByKeywordVo.getUserIds().split(","))
			.map(Long::parseLong)
			.collect(Collectors.toList());
			@@ -1950,6 +2157,9 @@
			if (orderFrom != null) {
			if (orderFrom == 1) {
			orderFromDesc = "商城订单";
			} else if(orderFrom == 2){

			orderFromDesc = "店铺砍价活动("+merOrderPageVo.getActivityName()+")";
			} else {
			orderFromDesc = "线下创建";
			}
			@@ -1968,12 +2178,12 @@
			Map<Long, MgtSimpleMemberVo> userMap = simpleMemberVoList.stream()
			.collect(Collectors.toMap(MgtSimpleMemberVo::getUserId, Function.identity()));
			for (MerOrderPageVo merOrderPageVo : merOrderPageVoList) {
			if(merOrderPageVo.getUserId()!=null&&userMap.get(merOrderPageVo.getUserId())!=null){
			if (merOrderPageVo.getUserId() != null && userMap.get(merOrderPageVo.getUserId()) != null) {
			merOrderPageVo.setUserName(userMap.get(merOrderPageVo.getUserId()).getRealName());
			merOrderPageVo.setNickName(userMap.get(merOrderPageVo.getUserId()).getNickName());
			merOrderPageVo.setUserMobile(userMap.get(merOrderPageVo.getUserId()).getUserMobile());
			}else{
			log.debug("订单merOrderPageVo"+merOrderPageVo.getOrderId()+"缺少用户");
			} else {
			log.debug("订单merOrderPageVo" + merOrderPageVo.getOrderId() + "缺少用户");
			}
			}
			}
			@@ -2157,7 +2367,7 @@
			}
			}
			MgtOrderTotal mgtOrderTotal = new MgtOrderTotal();
			MgtOrderTotal mgtOrderTotalFirst = orderMapper.totalOrderFirst();
			MgtOrderTotal mgtOrderTotalFirst = orderMapper.totalOrderFirst(mgtShopOrderPageDto);
			MgtOrderTotal mgtOrderTotalSecond = orderMapper.totalOrderSecond(mgtShopOrderPageDto);
			MgtOrderTotal mgtOrderTotalThird = orderMapper.totalOrderThird(mgtShopOrderPageDto);
			mgtOrderTotal.setOrderTotal(mgtOrderTotalFirst.getOrderTotal());
			@@ -2340,9 +2550,9 @@
			mgtOrderDetailVo.setCancelTime(order.getCancelTime());
			mgtOrderDetailVo.setOrderRemark(order.getOrderRemark());
			mgtOrderDetailVo.setShopId(order.getShopId());
			if(shop!=null){
			if (shop != null) {
			mgtOrderDetailVo.setShopName(shop.getShopName());
			}else{
			} else {
			mgtOrderDetailVo.setShopName("商户已被删除");
			}
			mgtOrderDetailVo.setVerifyTime(order.getUseTime());
			@@ -2362,6 +2572,8 @@
			@Override
			public MgtBulletinBoardVo boardOrderTotal() {
			MgtBulletinBoardVo mgtBulletinBoardVo = orderMapper.boardOrderTotal();
			Integer activityUserTotal = orderMapper.activityUserTotal();
			mgtBulletinBoardVo.setActivityUserTotal(activityUserTotal);
			return mgtBulletinBoardVo;
			}

			@@ -2932,11 +3144,11 @@
			} else if (couponStatus != 1) {
			throw new ServiceException(AppErrorConstant.COUPON_NO_FIND);
			}
			if (memberCoupon.getCouponFrom()==2&&!memberCoupon.getShopId().equals(shopId)) {
			if (memberCoupon.getCouponFrom() == 2 && !memberCoupon.getShopId().equals(shopId)) {
			throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
			}
			//如果是平台优惠券
			if(memberCoupon.getCouponFrom()==1&&memberCoupon.getShopId()==null){
			if (memberCoupon.getCouponFrom() == 1 && memberCoupon.getShopId() == null) {
			memberCoupon.setShopId(shopId);
			}
			List<Goods> goodsList = verifyCouponGetVo.getGoodsList();
			@@ -2974,34 +3186,34 @@
			}

			/**
			* @description 获取核销奖品
			* @author jqs
			* @date 2023/7/8 17:46
			* @param verifyCode
			* @param shopId
			* @return MerVerifyAwardVo
			* @return MerVerifyAwardVo
			* @description 获取核销奖品
			* @author jqs
			* @date 2023/7/8 17:46
			*/
			@Override
			public MerVerifyAwardVo verifyPrize(String verifyCode,Long shopId){
			public MerVerifyAwardVo verifyPrize(String verifyCode, Long shopId) {
			MerVerifyAwardVo merVerifyAwardVo = new MerVerifyAwardVo();
			MemberGiftRecord memberGiftRecord = remoteMemberService.getVerifyPrize(verifyCode).getData();
			if(memberGiftRecord==null\|\|memberGiftRecord.getVerifyStatus()!=1){
			if (memberGiftRecord == null \|\| memberGiftRecord.getVerifyStatus() != 1) {
			throw new ServiceException(AppErrorConstant.COUPON_USED);
			}
			if(memberGiftRecord.getGiftFrom()==2&&!memberGiftRecord.getShopId().equals(shopId)){
			if (memberGiftRecord.getGiftFrom() == 2 && !memberGiftRecord.getShopId().equals(shopId)) {
			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){
			if (memberGiftRecord.getGiftFrom() == 1) {
			merVerifyAwardVo.setGiftFrom("平台生日卡");
			}else{
			} else {
			merVerifyAwardVo.setGiftFrom("商户生日卡");
			}

			merVerifyAwardVo.setGiftType(memberGiftRecord.getGiftType());
			switch(memberGiftRecord.getGiftType()){
			switch (memberGiftRecord.getGiftType()) {
			case 1:
			merVerifyAwardVo.setGiftName(memberGiftRecord.getCouponName());
			merVerifyAwardVo.setGiftNumber(Double.valueOf(memberGiftRecord.getCouponNumber()));
			@@ -3141,22 +3353,22 @@
			orderMoneyValue[i] = BigDecimal.ZERO;
			}
			}*/
			List<MgtMapTotalPlusVo> mgtMapTotalPlusVoList = orderMapper.listMerOrderDistributionTotal(merTotalDto);
			if(mgtMapTotalPlusVoList!=null&&!mgtMapTotalPlusVoList.isEmpty()) {
			String[] orderTotalKey = new String[mgtMapTotalPlusVoList.size()];
			Integer[] orderTotalValue = new Integer[mgtMapTotalPlusVoList.size()];
			BigDecimal[] orderMoneyValue = new BigDecimal[mgtMapTotalPlusVoList.size()];
			MgtMapTotalPlusVo mgtMapTotalPlusVo;
			for (int i = 0; i < mgtMapTotalPlusVoList.size(); i++) {
			mgtMapTotalPlusVo = mgtMapTotalPlusVoList.get(i);
			orderTotalKey[i] = mgtMapTotalPlusVo.getMapKey();
			orderTotalValue[i] = mgtMapTotalPlusVo.getMapValueFirst();
			orderMoneyValue[i] = mgtMapTotalPlusVo.getMapValueSecond();
			}
			orderDistributionTotalVo.setOrderTotalKey(orderTotalKey);
			orderDistributionTotalVo.setOrderTotalValue(orderTotalValue);
			orderDistributionTotalVo.setOrderMoneyValue(orderMoneyValue);
			List<MgtMapTotalPlusVo> mgtMapTotalPlusVoList = orderMapper.listMerOrderDistributionTotal(merTotalDto);
			if (mgtMapTotalPlusVoList != null && !mgtMapTotalPlusVoList.isEmpty()) {
			String[] orderTotalKey = new String[mgtMapTotalPlusVoList.size()];
			Integer[] orderTotalValue = new Integer[mgtMapTotalPlusVoList.size()];
			BigDecimal[] orderMoneyValue = new BigDecimal[mgtMapTotalPlusVoList.size()];
			MgtMapTotalPlusVo mgtMapTotalPlusVo;
			for (int i = 0; i < mgtMapTotalPlusVoList.size(); i++) {
			mgtMapTotalPlusVo = mgtMapTotalPlusVoList.get(i);
			orderTotalKey[i] = mgtMapTotalPlusVo.getMapKey();
			orderTotalValue[i] = mgtMapTotalPlusVo.getMapValueFirst();
			orderMoneyValue[i] = mgtMapTotalPlusVo.getMapValueSecond();
			}
			orderDistributionTotalVo.setOrderTotalKey(orderTotalKey);
			orderDistributionTotalVo.setOrderTotalValue(orderTotalValue);
			orderDistributionTotalVo.setOrderMoneyValue(orderMoneyValue);
			}
			// 返回订单分布总数对象
			return orderDistributionTotalVo;
			}
			@@ -3261,15 +3473,27 @@
			}

			/**
			* @description 商户端订单管理统计
			* @author jqs
			* @date 2023/7/31 10:53
			* @param merOrderPageDto
			* @return MerTotalOrderVo
			* @return MerTotalOrderVo
			* @description 商户端订单管理统计
			* @author jqs
			* @date 2023/7/31 10:53
			*/
			@Override
			public MerTotalOrderVo totalMerOrder(MerOrderPageDto merOrderPageDto) {
			MerTotalOrderVo merTotalOrderVo = new MerTotalOrderVo();
			if (StringUtils.isNotBlank(merOrderPageDto.getKeyword())) {
			MgtUserIdByKeywordDto userIdByKeywordDto = new MgtUserIdByKeywordDto();
			userIdByKeywordDto.setKeyword(merOrderPageDto.getKeyword());
			MgtUserIdByKeywordVo userIdByKeywordVo = remoteMemberService.getUserIdByKeyword(userIdByKeywordDto).getData();
			if (StringUtils.isNotBlank(userIdByKeywordVo.getUserIds())) {
			List<Long> userIdList = Arrays.stream(userIdByKeywordVo.getUserIds().split(","))
			.map(Long::parseLong)
			.collect(Collectors.toList());
			merOrderPageDto.setMemberUserIdList(userIdList);
			merOrderPageDto.setMemberUserId(null);
			}
			}
			merTotalOrderVo = orderMapper.totalMerOrder(merOrderPageDto);
			return merTotalOrderVo;
			}
			@@ -3333,33 +3557,33 @@
			}

			/**
			* @description 自动取消订单
			* @author jqs
			* @date 2023/7/13 17:15
			* @param orderId
			* @return void
			* @return void
			* @description 自动取消订单
			* @author jqs
			* @date 2023/7/13 17:15
			*/
			@Override
			@Transactional
			public void autoCancelOrder(String orderId){
			public void autoCancelOrder(String orderId) {
			//更新订单信息
			Order order = this.getById(orderId);
			order.setOrderStatus(0);
			order.setCancelTime(new Date());
			this.saveOrUpdate(order);
			//活动订单回退库存
			if(order.getOrderFrom()==2){
			if (order.getOrderFrom() == 2) {
			List<OrderGoods> orderGoodsList = orderGoodsService.listByOrderId(orderId);
			if(orderGoodsList!=null&&!orderGoodsList.isEmpty()){
			for(OrderGoods orderGoods : orderGoodsList){
			if (orderGoodsList != null && !orderGoodsList.isEmpty()) {
			for (OrderGoods orderGoods : orderGoodsList) {
			//redis库存控制极简版
			String goodsLock = "goods_lock_"+order.getActivityId()+"_"+orderGoods.getGoodsId();
			String goodsLock = "goods_lock_" + order.getActivityId() + "_" + orderGoods.getGoodsId();
			RLock redissonLock = redissonClient.getLock(goodsLock);
			try{
			try {
			redissonLock.lock(30, TimeUnit.SECONDS);
			Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+order.getActivityId()+"-"+orderGoods.getGoodsId());
			redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+order.getActivityId()+"-"+orderGoods.getGoodsId(),surpNum+orderGoods.getBuyNum());
			}finally{
			Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId());
			redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId(), surpNum + orderGoods.getBuyNum());
			} finally {
			redissonLock.unlock();
			}
			//改变活动库存
			@@ -3380,16 +3604,16 @@
			remoteActivityService.delActivityRecord(activityRecord);
			}
			}
			}else{
			if(order.getCouponMoney().compareTo(BigDecimal.ZERO)>0){
			} else {
			if (order.getCouponMoney().compareTo(BigDecimal.ZERO) > 0) {
			//回退优惠券
			List<OrderGoods> orderGoodsList = orderGoodsService.listByOrderId(orderId);
			if(orderGoodsList!=null&&!orderGoodsList.isEmpty()) {
			if (orderGoodsList != null && !orderGoodsList.isEmpty()) {
			StringJoiner memberCouponSJ = new StringJoiner(",");
			for (OrderGoods orderGoods : orderGoodsList) {
			memberCouponSJ.add(orderGoods.getCouponId());
			}
			if(memberCouponSJ!=null){
			if (memberCouponSJ != null) {
			remoteCouponService.backMemberCoupon(memberCouponSJ.toString());

			}
			@@ -3399,17 +3623,17 @@
			}

			/**
			* @description 订单支付回调
			* @author jqs
			* @date 2023/7/13 17:57
			* @param transaction
			* @return void
			* @return void
			* @description 订单支付回调
			* @author jqs
			* @date 2023/7/13 17:57
			*/
			@Override
			@Transactional
			public void payBack(Transaction transaction) {
			public void payBack(PartnerTransactionsResult transaction) {
			// 更新订单状态
			String orderId=transaction.getOutTradeNo();
			String orderId = transaction.getOutTradeNo();
			Order order = this.getById(orderId);
			order.setOrderStatus(2);
			order.setPayTime(new Date());
			@@ -3455,8 +3679,8 @@
			goodsTotalChangeDto.setChangeType(1);
			goodsTotalChangeDto.setChangeNum(orderGoods.getBuyNum());
			goodsTotalChangeDto.setMoney(orderGoods.getGoodsReceivableMoney());
			Integer bugGoodsNum = orderMapper.countUserBuyGoodsNum(order.getUserId(),orderGoods.getGoodsId());
			if(bugGoodsNum==null\|\|bugGoodsNum<1){
			Integer bugGoodsNum = orderMapper.countUserBuyGoodsNum(order.getUserId(), orderGoods.getGoodsId());
			if (bugGoodsNum == null \|\| bugGoodsNum < 1) {
			goodsTotalChangeDto.setPersonNum(1);
			}
			goodsTotalChangeDtoList.add(goodsTotalChangeDto);
			@@ -3499,6 +3723,9 @@
			if (haveGoods) {
			memberTotalChangeDto.setGoodsOrderChange(1);
			}
			if(order.getOrderFrom()==2){
			memberTotalChangeDto.setActivityTime(order.getCreateTime());
			}
			// 更新会员统计信息
			remoteMemberService.changeMemberTotal(memberTotalChangeDto);
			// 如果订单来源于活动，则更新活动统计信息
			@@ -3537,16 +3764,16 @@
			}

			/**
			* @description 订单退款
			* @author jqs
			* @date 2023/7/13 18:36
			* @param orderId
			* @return void
			* @return void
			* @description 订单退款
			* @author jqs
			* @date 2023/7/13 18:36
			*/
			@Override
			@Transactional
			public void refundOrder(String orderId){
			//更新订单信息
			public void refundOrder(String orderId) {
			// 更新订单信息
			Order order = this.getById(orderId);
			order.setOrderStatus(0);
			order.setCancelTime(new Date());
			@@ -3559,7 +3786,7 @@
			orderRefund.setOrderId(order.getOrderId());
			orderRefund.setUserId(order.getUserId());
			orderRefund.setShopId(order.getShopId());
			orderRefund.setRefundMoney(order.getPayMoney());
			orderRefund.setRefundMoney(order.getOnlinePayMoney());
			orderRefund.setOrderMoney(order.getPayMoney());
			orderRefund.setCreateTime(new Date());
			// 初始化各类商品的收款金额
			@@ -3573,19 +3800,19 @@
			Boolean haveExperience = false;
			Boolean haveGoods = false;
			List<OrderGoods> orderGoodsList = orderGoodsService.listByOrderId(orderId);
			if(orderGoodsList!=null&&!orderGoodsList.isEmpty()){
			if (orderGoodsList != null && !orderGoodsList.isEmpty()) {
			StringJoiner memberCouponSJ = new StringJoiner(",");
			for(OrderGoods orderGoods : orderGoodsList){
			if(order.getOrderFrom()==2){
			for (OrderGoods orderGoods : orderGoodsList) {
			if (order.getOrderFrom() == 2) {
			//redis库存控制极简版
			//活动订单回退库存
			String goodsLock = "goods_lock_"+order.getActivityId()+"_"+orderGoods.getGoodsId();
			String goodsLock = "goods_lock_" + order.getActivityId() + "_" + orderGoods.getGoodsId();
			RLock redissonLock = redissonClient.getLock(goodsLock);
			try{
			try {
			redissonLock.lock(30, TimeUnit.SECONDS);
			Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+order.getActivityId()+"-"+orderGoods.getGoodsId());
			redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+order.getActivityId()+"-"+orderGoods.getGoodsId(),surpNum+orderGoods.getBuyNum());
			}finally{
			Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId());
			redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId(), surpNum + orderGoods.getBuyNum());
			} finally {
			redissonLock.unlock();
			}
			//改变活动库存
			@@ -3604,7 +3831,7 @@
			activityRecord.setUserId(order.getUserId());
			activityRecord.setOrderTime(order.getCreateTime());
			remoteActivityService.delActivityRecord(activityRecord);
			}else{
			} else {
			memberCouponSJ.add(orderGoods.getCouponId());
			}
			switch (orderGoods.getGoodsType()) {
			@@ -3629,7 +3856,7 @@
			}
			}
			//回退优惠券
			if(memberCouponSJ!=null){
			if (memberCouponSJ != null) {
			remoteCouponService.backMemberCoupon(memberCouponSJ.toString());
			}
			}
			@@ -3688,43 +3915,97 @@
			activityTotalChangeDto.setUserId(order.getUserId());
			remoteActivityService.changeActivityTotal(activityTotalChangeDto);
			}

			// 用户取消订单退款
			BigDecimal onlinePayMoney = order.getOnlinePayMoney();
			if(BigDecimal.ZERO.compareTo(onlinePayMoney) < 0){
			// 订单支付金额大于0，可发起退款
			orderWxApplyRefund(orderId, refundId, onlinePayMoney, orderRefund);
			}

			orderRefund.setRefundStatus(1);
			orderRefundService.saveOrUpdate(orderRefund);
			}

			/**
			* @description 员工端活动订单统计
			* @author jqs
			* @date 2023/7/17 15:25
			* 申请退款API
			*/
			private void orderWxApplyRefund(String orderId, String outRefundNo, BigDecimal payMoney, OrderRefund orderRefund){
			try {
			// 创建支付订单
			OrderPayment orderPayment = orderPaymentService.getByOrderId(orderId);
			if (null == orderPayment) {
			return;
			}
			String subMchId = orderPayment.getSubMchId();
			WxPayConfig config = wxService.getConfig();

			RefundsRequest request = new RefundsRequest();
			request.setSpAppid(config.getAppId());
			request.setSubMchid(subMchId);
			request.setTransactionId(orderPayment.getTransactionId());
			request.setOutRefundNo(outRefundNo);
			request.setReason("用户取消订单");
			// 订单金额
			int total = payMoney.multiply(new BigDecimal(100)).intValue();
			RefundsRequest.Amount amount = RefundsRequest.Amount.builder().refund(total).total(total).currency("CNY").build();
			request.setAmount(amount);
			request.setNotifyUrl(config.getNotifyUrl());

			RefundsResult result = wxService.getEcommerceService().refunds(request);

			// 微信退款id
			orderRefund.setWxRefundId(result.getRefundId());

			// 请求参数
			Gson gson = new Gson();
			String refundRequestJson = gson.toJson(request);
			// 返回参数
			String refundResponseJson = gson.toJson(result);

			// 保存支付订单统一下单日志
			paymentMessageService.savePaymentMessage("3", orderId, refundRequestJson, refundResponseJson);

			} catch (WxPayException e) {
			throw new ServiceException(e.getMessage());
			}
			}

			/**
			* @param staffTotalDto
			* @return StaffActivityOrderTotalVo
			* @return StaffActivityOrderTotalVo
			* @description 员工端活动订单统计
			* @author jqs
			* @date 2023/7/17 15:25
			*/
			@Override
			public StaffActivityOrderTotalVo getStaffActivityOrderTotal(StaffTotalDto staffTotalDto){
			public StaffActivityOrderTotalVo getStaffActivityOrderTotal(StaffTotalDto staffTotalDto) {
			StaffActivityOrderTotalVo staffActivityOrderTotalVo = orderMapper.getStaffActivityOrderTotal(staffTotalDto);
			return staffActivityOrderTotalVo;
			}

			/**
			* @description 员工端活动统计
			* @author jqs
			* @date 2023/7/17 15:51
			* @param staffTotalDto
			* @return StaffActivityTotalVo
			* @return StaffActivityTotalVo
			* @description 员工端活动统计
			* @author jqs
			* @date 2023/7/17 15:51
			*/
			@Override
			public StaffActivityTotalVo getStaffActivityTotal(StaffTotalDto staffTotalDto){
			public StaffActivityTotalVo getStaffActivityTotal(StaffTotalDto staffTotalDto) {
			StaffActivityTotalVo staffActivityTotalVo = orderMapper.getStaffActivityTotal(staffTotalDto);
			return staffActivityTotalVo;
			}

			/**
			* @description 员工端活动统计订单分布
			* @author jqs
			* @date 2023/7/17 16:16
			* @param staffTotalDto
			* @return MerOrderDistributionTotalVo
			* @return MerOrderDistributionTotalVo
			* @description 员工端活动统计订单分布
			* @author jqs
			* @date 2023/7/17 16:16
			*/
			@Override
			public MerOrderDistributionTotalVo getStaffOrderDistributionTotal(StaffTotalDto staffTotalDto){
			public MerOrderDistributionTotalVo getStaffOrderDistributionTotal(StaffTotalDto staffTotalDto) {
			MerOrderDistributionTotalVo orderDistributionTotalVo = new MerOrderDistributionTotalVo();
			// 获取订单年龄用户列表
			MerTotalDto merTotalDto = new MerTotalDto();
			@@ -3765,7 +4046,7 @@
			}
			// 如果用户ID列表不为空
			if (userIdList != null && !userIdList.isEmpty()) {
			mgtMapTotalPlusVo = orderMapper.listStaffActivityOrderDistributionTotal(userIdList,staffTotalDto.getShopId(),staffTotalDto.getActivityId());
			mgtMapTotalPlusVo = orderMapper.listStaffActivityOrderDistributionTotal(userIdList, staffTotalDto.getShopId(), staffTotalDto.getActivityId());
			orderTotalValue[i] = mgtMapTotalPlusVo.getMapValueFirst();
			orderMoneyValue[i] = mgtMapTotalPlusVo.getMapValueSecond();
			} else {
			@@ -3784,14 +4065,14 @@


			/**
			* @description 员工端活动统计销售占比
			* @author jqs
			* @date 2023/7/17 17:03
			* @param staffTotalDto
			* @return MerOrderTypeTotalVo
			* @return MerOrderTypeTotalVo
			* @description 员工端活动统计销售占比
			* @author jqs
			* @date 2023/7/17 17:03
			*/
			@Override
			public MerOrderTypeTotalVo getStaffOrderTypeTotal(StaffTotalDto staffTotalDto){
			public MerOrderTypeTotalVo getStaffOrderTypeTotal(StaffTotalDto staffTotalDto) {
			MerOrderTypeTotalVo orderTypeTotalVo = new MerOrderTypeTotalVo();
			//获取商品分类销售数据
			List<MgtMapTotalPlusVo> MgtMapIntTotalVoGoodsType = orderMapper.listStaffOrderTotalGoodsType(staffTotalDto);
			@@ -3829,11 +4110,11 @@
			}

			/**
			* @description 员工端获客人数
			* @author jqs
			* @date 2023/7/17 18:42
			* @param staffTotalDto
			* @return StaffActivityDateMemberTotalVo
			* @return StaffActivityDateMemberTotalVo
			* @description 员工端获客人数
			* @author jqs
			* @date 2023/7/17 18:42
			*/
			@Override
			public StaffActivityDateMemberTotalVo getStaffActivityGetMemberTotal(StaffTotalDto staffTotalDto) {
			@@ -3870,11 +4151,11 @@
			}

			/**
			* @description 员工端获客人数
			* @author jqs
			* @date 2023/7/17 18:42
			* @param staffTotalDto
			* @return StaffActivityDateMemberTotalVo
			* @return StaffActivityDateMemberTotalVo
			* @description 员工端获客人数
			* @author jqs
			* @date 2023/7/17 18:42
			*/
			@Override
			public StaffActivityDateMemberTotalVo getStaffActivityMemberTotal(StaffTotalDto staffTotalDto) {
			@@ -3911,12 +4192,12 @@
			}

			/**
			* @description 获取时间段日期
			* @author jqs
			* @date 2023/7/17 19:11
			* @param startDate
			* @param endDate
			* @return List<String>
			* @return List<String>
			* @description 获取时间段日期
			* @author jqs
			* @date 2023/7/17 19:11
			*/
			public static List<String> getDateRange(String startDate, String endDate) {
			List<String> dateList = new ArrayList<>();
			@@ -3930,50 +4211,87 @@
			}

			/**
			* @description 检查订单状态定时任务
			* @author jqs
			* @date 2023/7/25 14:40
			* @param
			* @return void
			* @return void
			* @description 检查订单状态定时任务
			* @author jqs
			* @date 2023/7/25 14:40
			*/
			@Override
			public void checkOrderStatus(){
			public void checkOrderStatus() {
			Integer delayTime = 30;
			if(redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)){
			if (redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)) {
			delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME);
			}
			delayTime = delayTime + 5;
			Date checkTime = DateUtils.addMinutes(new Date(),-delayTime);
			Date checkTime = DateUtils.addMinutes(new Date(), -delayTime);
			LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
			queryWrapper.eq(Order::getDelFlag,0);
			queryWrapper.lt(Order::getCreateTime,checkTime);
			queryWrapper.eq(Order::getOrderStatus,1);
			queryWrapper.eq(Order::getDelFlag, 0);
			queryWrapper.lt(Order::getCreateTime, checkTime);
			queryWrapper.eq(Order::getOrderStatus, 1);
			List<Order> orderList = this.list(queryWrapper);
			if(orderList!=null&&!orderList.isEmpty()){
			for(Order order: orderList){
			if (orderList != null && !orderList.isEmpty()) {
			for (Order order : orderList) {
			autoTimeCancelOrder(order);
			}
			}
			}

			private void autoTimeCancelOrder(Order order){
			@Override
			public void profitSharingBack(ProfitSharingNotifyResult result) {

			try {
			String outOrderNo = result.getOutOrderNo();
			ProfitSharing profitSharing = profitSharingService.getById(outOrderNo);
			if(null != profitSharing){
			profitSharing.setWxOrderId(result.getOrderId());
			profitSharing.setFinishTime(result.getSuccessTime());
			profitSharing.setFinishFlag(1);

			profitSharingService.saveOrUpdate(profitSharing);
			}
			} catch (Exception e){

			log.error("==分账回成功回调操作====【{}】========={}", result.getOutOrderNo(), e.getMessage());
			}
			}

			@Override
			public void orderRefundBack(RefundNotifyResult result) {
			try {
			String outRefundNo = result.getOutRefundNo();
			String refundStatus = result.getRefundStatus();
			OrderRefund orderRefund = orderRefundService.getById(outRefundNo);
			if(null != orderRefund){
			orderRefund.setWxRefundId(result.getRefundId());
			orderRefund.setBackTime(result.getSuccessTime());
			orderRefund.setRefundStatus(IDict.getCodeByText(RefundStatusEnum.class, refundStatus));
			orderRefundService.saveOrUpdate(orderRefund);
			}
			} catch (Exception e){

			log.error("==退款回成功回调操作====【{}】========={}", result.getOutRefundNo(), e.getMessage());
			}
			}

			private void autoTimeCancelOrder(Order order) {
			String orderId = order.getOrderId();
			order.setOrderStatus(0);
			order.setCancelTime(new Date());
			this.saveOrUpdate(order);
			//活动订单回退库存
			if(order.getOrderFrom()==2){
			if (order.getOrderFrom() == 2) {
			List<OrderGoods> orderGoodsList = orderGoodsService.listByOrderId(orderId);
			if(orderGoodsList!=null&&!orderGoodsList.isEmpty()){
			for(OrderGoods orderGoods : orderGoodsList){
			if (orderGoodsList != null && !orderGoodsList.isEmpty()) {
			for (OrderGoods orderGoods : orderGoodsList) {
			//redis库存控制极简版
			String goodsLock = "goods_lock_"+order.getActivityId()+"_"+orderGoods.getGoodsId();
			String goodsLock = "goods_lock_" + order.getActivityId() + "_" + orderGoods.getGoodsId();
			RLock redissonLock = redissonClient.getLock(goodsLock);
			try{
			try {
			redissonLock.lock(30, TimeUnit.SECONDS);
			Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+order.getActivityId()+"-"+orderGoods.getGoodsId());
			redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+order.getActivityId()+"-"+orderGoods.getGoodsId(),surpNum+orderGoods.getBuyNum());
			}finally{
			Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId());
			redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + order.getActivityId() + "-" + orderGoods.getGoodsId(), surpNum + orderGoods.getBuyNum());
			} finally {
			redissonLock.unlock();
			}
			//改变活动库存
			@@ -3994,16 +4312,16 @@
			remoteActivityService.delActivityRecord(activityRecord);
			}
			}
			}else{
			if(order.getCouponMoney().compareTo(BigDecimal.ZERO)>0){
			} else {
			if (order.getCouponMoney().compareTo(BigDecimal.ZERO) > 0) {
			//回退优惠券
			List<OrderGoods> orderGoodsList = orderGoodsService.listByOrderId(orderId);
			if(orderGoodsList!=null&&!orderGoodsList.isEmpty()) {
			if (orderGoodsList != null && !orderGoodsList.isEmpty()) {
			StringJoiner memberCouponSJ = new StringJoiner(",");
			for (OrderGoods orderGoods : orderGoodsList) {
			memberCouponSJ.add(orderGoods.getCouponId());
			}
			if(memberCouponSJ!=null){
			if (memberCouponSJ != null) {
			remoteCouponService.backMemberCoupon(memberCouponSJ.toString());

			}
			@@ -4011,4 +4329,69 @@
			}
			}
			}

			/**
			* @description 获取商户订单统计
			* @author jqs
			* @date 2023/8/4 10:25
			* @param mgtShopAllOrderPageDto
			* @return MgtShopAllOrderTotal
			*/
			@Override
			public MgtShopAllOrderTotal getMgtShopAllOrderTotal(MgtShopAllOrderPageDto mgtShopAllOrderPageDto){
			MgtShopAllOrderTotal shopAllOrderTotal = orderMapper.getMgtShopAllOrderTotal(mgtShopAllOrderPageDto);
			return shopAllOrderTotal;
			}

			/**
			* 分页获取会员消费记录
			* @param merOrderPageDto
			* @return
			*/
			@Override
			public List<MerOrderPageVo> pageMerMemberPayOrder(Page page,MerMemberNoClearOrderDto merOrderPageDto){
			List<MerOrderPageVo> merOrderPageVoList = orderMapper.pageMerMemberPayOrder(page, merOrderPageDto);
			if (merOrderPageVoList != null && !merOrderPageVoList.isEmpty()) {
			Long userId;
			Member member;
			Integer orderFrom;
			String orderFromDesc;
			BigDecimal zeroBig = new BigDecimal("0.00");
			StringJoiner userIdSj = new StringJoiner(",");
			for (MerOrderPageVo merOrderPageVo : merOrderPageVoList) {
			userId = merOrderPageVo.getUserId();
			userIdSj.add(userId.toString());
			orderFrom = merOrderPageVo.getOrderFrom();
			if (orderFrom != null) {
			if (orderFrom == 1) {
			orderFromDesc = "商城订单";
			} else {
			orderFromDesc = "线下创建";
			}
			} else {
			orderFromDesc = "商城订单";
			}
			merOrderPageVo.setOrderFromDesc(orderFromDesc);
			merOrderPageVo.setUnPaidMoney(merOrderPageVo.getPayMoney().subtract(merOrderPageVo.getReceiveMoney()));
			if (merOrderPageVo.getUnPaidMoney() == null) {
			merOrderPageVo.setUnPaidMoney(zeroBig);
			}
			}
			MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto();
			mgtBaseBathDto.setIds(userIdSj.toString());
			List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(mgtBaseBathDto).getData();
			Map<Long, MgtSimpleMemberVo> userMap = simpleMemberVoList.stream()
			.collect(Collectors.toMap(MgtSimpleMemberVo::getUserId, Function.identity()));
			for (MerOrderPageVo merOrderPageVo : merOrderPageVoList) {
			if(merOrderPageVo.getUserId()!=null&&userMap.get(merOrderPageVo.getUserId())!=null){
			merOrderPageVo.setUserName(userMap.get(merOrderPageVo.getUserId()).getRealName());
			merOrderPageVo.setNickName(userMap.get(merOrderPageVo.getUserId()).getNickName());
			merOrderPageVo.setUserMobile(userMap.get(merOrderPageVo.getUserId()).getUserMobile());
			}else{
			log.debug("订单merOrderPageVo"+merOrderPageVo.getOrderId()+"缺少用户");
			}
			}
			}
			return merOrderPageVoList;
			}
			}