From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' 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 | 1570 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 1,364 insertions(+), 206 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
index 6120b1d..2155f03 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
@@ -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,22 +23,29 @@
 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.mapper.order.UserServiceRecordMapper;
-import com.ruoyi.order.service.order.ConsumerGoodsService;
-import com.ruoyi.order.service.order.OrderGoodsService;
-import com.ruoyi.order.service.order.OrderService;
-import com.ruoyi.order.service.order.UserServiceRecordService;
+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;
 import com.ruoyi.system.api.constant.SecurityConstant;
 import com.ruoyi.system.api.domain.dto.*;
+import com.ruoyi.system.api.domain.poji.activity.ActivityRecord;
 import com.ruoyi.system.api.domain.poji.config.DelayTask;
 import com.ruoyi.system.api.domain.poji.goods.Goods;
 import com.ruoyi.system.api.domain.poji.goods.GoodsFile;
@@ -36,16 +54,22 @@
 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 lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
@@ -60,6 +84,7 @@
  * @since 2023-04-25
  */
 @Service
+@Slf4j
 public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements OrderService {
 
     @Resource
@@ -99,13 +124,28 @@
     private RemoteActivityService remoteActivityService;
 
     @Resource
-    private UserServiceRecordMapper userServiceRecordMapper;
+    private RedisService redisService;
 
     @Resource
-    private RedisService redisService;
+    private PayRecordService payRecordService;
 
     @Autowired
     private RedissonClient redissonClient;
+
+    @Autowired
+    private WxPayService wxService;
+
+    @Resource
+    private PaymentMessageService paymentMessageService;
+
+    @Resource
+    private OrderPaymentService orderPaymentService;
+
+    @Resource
+    private ProfitSharingService profitSharingService;
+
+    @Resource
+    private OrderRefundService orderRefundService;
 
     /**
      * @description: buyGoods
@@ -124,6 +164,20 @@
         AppSureOrderGoodsVo appSureOrderGoodsVo;
         // 获取购买商品列表
         List<AppBuyGoodsDto> appBuyGoodsDtoList = appSureOrderDto.getAppBuyGoodsDtoList();
+        //获取商品列表
+        StringJoiner goodsIdSJ = new StringJoiner(",");
+        for (AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList) {
+            goodsIdSJ.add(appBuyGoodsDto.getGoodsId());
+        }
+        List<Goods> goodsList = remoteGoodsService.listGoodsByGoodsId(goodsIdSJ.toString()).getData();
+        Map<String, Goods> goodsMap = goodsList.stream()
+                .collect(Collectors.toMap(Goods::getGoodsId, Function.identity()));
+        Boolean haveDeposit = false;
+        for (Goods goods : goodsList) {
+            if (goods.getSubscription() != null && goods.getSubscription().compareTo(BigDecimal.ZERO) > 0) {
+                haveDeposit = true;
+            }
+        }
         String goodsId;
         Integer buyNum;
         BigDecimal buyNumBig;
@@ -132,12 +186,17 @@
         BigDecimal goodsPrice;
         BigDecimal goodsTotalPrice;
         BigDecimal goodsRealPrice;
+        MerBaseDto merBaseDto = new MerBaseDto();
+        merBaseDto.setUserId(userId);
+        merBaseDto.setShopId(appSureOrderDto.getShopId());
         // 获取用户优惠券列表
-        List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(userId).getData();
-        // 初始化商品优惠券列表
-        List<AppMemberCouponVo> appGoodsMemberCouponVoList;
+        List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(merBaseDto).getData();
+
         // 将优惠券列表转换为Map，以优惠券ID为键
-        Map<String, AppMemberCouponVo> appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
+        Map<String, AppMemberCouponVo> appMemberCouponVoMap = new HashMap<>();
+        if (appMemberCouponVoList != null && !appMemberCouponVoList.isEmpty()) {
+            appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
+        }
         AppMemberCouponVo appMemberCouponVo;
         Integer couponType;
         BigDecimal moneyThreshold;
@@ -161,8 +220,8 @@
             buyNum = appBuyGoodsDto.getBuyNum();
             memberCouponId = appBuyGoodsDto.getMemberCouponId();
             // 获取商品信息
-            goods = remoteGoodsService.getGoods(goodsId).getData();
-            if(goods.getGoodsStatus()!=1){
+            goods = goodsMap.get(goodsId);
+            if (goods.getGoodsStatus() != 1) {
                 throw new ServiceException(AppErrorConstant.GOODS_DOWN);
             }
             // 设置订单商品信息
@@ -194,8 +253,8 @@
                     couponType = appMemberCouponVo.getCouponType();
                     if (couponType == 1 && appMemberCouponVo.getMoneyThreshold() != null && appMemberCouponVo.getDiscountMoney() != null) {
                         moneyThreshold = appMemberCouponVo.getMoneyThreshold();
-                        if (goodsTotalPrice.compareTo(moneyThreshold) >= 0) {
-                            discountMoney = appMemberCouponVo.getDiscountMoney();
+                        discountMoney = appMemberCouponVo.getDiscountMoney();
+                        if (goodsTotalPrice.compareTo(moneyThreshold) >= 0 && goodsTotalPrice.compareTo(discountMoney) > 0) {
                             goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
                             useCoupon = 1;
                             userCouponIdSet.add(memberCouponId);
@@ -203,20 +262,22 @@
                         }
                     } else if (couponType == 2 && appMemberCouponVo.getDiscountPercent() != null) {
                         discountPercent = appMemberCouponVo.getDiscountPercent();
-                        goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN).setScale(2, BigDecimal.ROUND_HALF_UP);
-                        discountMoney = goodsRealPrice.subtract(goodsTotalPrice);
+                        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();
-                        goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
-                        if(goodsRealPrice.compareTo(BigDecimal.ZERO)<0){
-                            goodsRealPrice = BigDecimal.ZERO;
+                        if (goodsTotalPrice.compareTo(discountMoney) > 0) {
+                            goodsRealPrice = goodsTotalPrice.subtract(discountMoney);
+                            if (goodsRealPrice.compareTo(BigDecimal.ZERO) < 0) {
+                                goodsRealPrice = BigDecimal.ZERO;
+                            }
+                            useCoupon = 1;
+                            userCouponIdSet.add(memberCouponId);
+                            appSureOrderGoodsVo.setMemberCouponId(memberCouponId);
                         }
-                        useCoupon = 1;
-                        userCouponIdSet.add(memberCouponId);
-                        appSureOrderGoodsVo.setMemberCouponId(memberCouponId);
                     }
                 }
             }
@@ -224,9 +285,16 @@
             appSureOrderGoodsVo.setGoodsTotalPrice(goodsTotalPrice);
             appSureOrderGoodsVo.setCouponDiscount(discountMoney);
             appSureOrderGoodsVo.setGoodsRealPrice(goodsRealPrice);
+            // 获取商品押金
             goodsDeposit = goods.getSubscription();
-            if (goodsDeposit == null) {
-                goodsDeposit = new BigDecimal("0.00");
+            if (goodsDeposit != null && goodsDeposit.compareTo(BigDecimal.ZERO) > 0) {
+                goodsDeposit = goodsDeposit.multiply(buyNumBig);
+            } else {
+                if (haveDeposit) {
+                    goodsDeposit = goodsRealPrice;
+                } else {
+                    goodsDeposit = new BigDecimal("0.00");
+                }
             }
             appSureOrderGoodsVo.setGoodsDeposit(goodsDeposit);
             // 计算订单总金额
@@ -238,6 +306,39 @@
         }
         //处理优惠券列表
         if (appMemberCouponVoList != null && !appMemberCouponVoList.isEmpty()) {
+            for (AppMemberCouponVo entity : appMemberCouponVoList) {
+                if (userCouponIdSet != null && userCouponIdSet.contains(entity.getMemberCouponId())) {
+                    entity.setUseFlag(1);
+                } else {
+                    entity.setUseFlag(0);
+                }
+
+
+            }
+            // 过滤商品优惠券列表
+            List<AppMemberCouponVo> appGoodsMemberCouponVoList;
+            for (AppSureOrderGoodsVo sureOrderGoodsVo : appSureOrderGoodsVoList) {
+                appGoodsMemberCouponVoList = new ArrayList<>();
+                for (AppMemberCouponVo entity : appMemberCouponVoList) {
+                    if (StringUtils.isBlank(entity.getRelGoodsIds()) || entity.getRelGoodsIds().contains(sureOrderGoodsVo.getGoodsId())) {
+                        if (entity.getCouponType() == 1) {
+                            if (entity.getMoneyThreshold().compareTo(sureOrderGoodsVo.getGoodsTotalPrice()) < 0 && entity.getDiscountMoney().compareTo(sureOrderGoodsVo.getGoodsTotalPrice()) < 0) {
+                                appGoodsMemberCouponVoList.add(entity);
+                            }
+                        } else if (entity.getCouponType() == 2) {
+                            appGoodsMemberCouponVoList.add(entity);
+                        } else if (entity.getCouponType() == 3) {
+                            if (entity.getDiscountMoney().compareTo(sureOrderGoodsVo.getGoodsTotalPrice()) < 0) {
+                                appGoodsMemberCouponVoList.add(entity);
+                            }
+                        }
+
+                    }
+                }
+                sureOrderGoodsVo.setAppMemberCouponVoList(appGoodsMemberCouponVoList);
+            }
+        }
+        /*if (appMemberCouponVoList != null && !appMemberCouponVoList.isEmpty()) {
             // 获取商品关联优惠券
             appGoodsMemberCouponVoList = new ArrayList<>();
             for(AppSureOrderGoodsVo sureOrderGoodsVo : appSureOrderGoodsVoList){
@@ -288,7 +389,7 @@
                 }
                 sureOrderGoodsVo.setAppMemberCouponVoList(appGoodsMemberCouponVoList);
             }
-        }
+        }*/
         // 设置订单相关金额
         appSureOrderVo.setOrderGoodsMoney(orderGoodsMoney);
         appSureOrderVo.setCouponDiscount(couponDiscount);
@@ -334,13 +435,21 @@
         if (activityGoodsGetVo.getActivityStatus() == 2) {
             throw new ServiceException(AppErrorConstant.ACTIVITY_END);
         }
-        if (activityGoodsGetVo.getAvailableBuyNum() < 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) {
+            throw new ServiceException(AppErrorConstant.ACTIVITY_GOODS_BEYOND);
+        }
+        if (activityGoodsGetVo.getAvailableBuyNum() < buyNum) {
+            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);
         appPanicBuyVo.setGoodsId(goodsId);
         appPanicBuyVo.setGoodsName(goods.getGoodsName());
         appPanicBuyVo.setGoodsIntroduction(goods.getGoodsIntroduction());
@@ -367,8 +476,10 @@
         appPanicBuyVo.setGoodsTotalPrice(goodsTotalPrice);
         appPanicBuyVo.setGoodsRealPrice(goodsRealPrice);
         goodsDeposit = activityGoodsGetVo.getActivitySubscription();
-        if (goodsDeposit == null) {
+        if (goodsDeposit == null || goodsDeposit.compareTo(BigDecimal.ZERO) == 0) {
             goodsDeposit = new BigDecimal("0.00");
+        } else {
+            goodsDeposit = goodsDeposit.multiply(buyNumBig);
         }
         appPanicBuyVo.setGoodsDeposit(goodsDeposit);
         orderGoodsMoney = orderGoodsMoney.add(goodsTotalPrice);
@@ -387,6 +498,7 @@
      * @return
      */
     @Override
+    @Transactional
     public AppPlaceOrderVo placeOrder(AppPlaceOrderDto appPlaceOrderDto) {
         // 获取用户ID
         Long userId = appPlaceOrderDto.getUserId();
@@ -397,6 +509,20 @@
         AppSureOrderGoodsVo appSureOrderGoodsVo;
         // 获取购买的商品列表
         List<AppBuyGoodsDto> appBuyGoodsDtoList = appPlaceOrderDto.getAppBuyGoodsDtoList();
+        StringJoiner goodsIdSJ = new StringJoiner(",");
+        for (AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList) {
+            goodsIdSJ.add(appBuyGoodsDto.getGoodsId());
+        }
+        //获取商品列表
+        List<Goods> goodsList = remoteGoodsService.listGoodsByGoodsId(goodsIdSJ.toString()).getData();
+        Map<String, Goods> goodsMap = goodsList.stream()
+                .collect(Collectors.toMap(Goods::getGoodsId, Function.identity()));
+        Boolean haveDeposit = false;
+        for (Goods goods : goodsList) {
+            if (goods.getSubscription() != null && goods.getSubscription().compareTo(BigDecimal.ZERO) > 0) {
+                haveDeposit = true;
+            }
+        }
         // 初始化变量
         String goodsId;
         Integer buyNum;
@@ -404,13 +530,16 @@
         Integer serviceNum;
         Integer goodsNum = 0;
         String memberCouponId;
-        Goods goods;
+        Goods goods = null;
         GoodsFile goodsFile;
         BigDecimal goodsPrice;
         BigDecimal goodsTotalPrice;
         BigDecimal goodsRealPrice;
+        MerBaseDto merBaseDto = new MerBaseDto();
+        merBaseDto.setUserId(userId);
+        merBaseDto.setShopId(appPlaceOrderDto.getShopId());
         // 获取用户优惠券列表
-        List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(userId).getData();
+        List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(merBaseDto).getData();
         // 将用户优惠券列表转换为Map，方便后续查找
         Map<String, AppMemberCouponVo> appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
         AppMemberCouponVo appMemberCouponVo;
@@ -433,6 +562,7 @@
         HashSet<String> goodsTypeSet = new HashSet<>();
         //使用优惠券
         StringJoiner memberCouponSJ = new StringJoiner(",");
+        List<String> goodsNameList = new ArrayList<>();
         // 遍历购买的商品列表
         for (AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList) {
             appSureOrderGoodsVo = new AppSureOrderGoodsVo();
@@ -441,7 +571,8 @@
             goodsId = appBuyGoodsDto.getGoodsId();
             memberCouponId = appBuyGoodsDto.getMemberCouponId();
             // 获取商品信息
-            goods = remoteGoodsService.getGoods(goodsId).getData();
+            goods = goodsMap.get(goodsId);
+            goodsNameList.add(goods.getGoodsName());
             // 设置商品信息
             appSureOrderGoodsVo.setGoodsId(goodsId);
             appSureOrderGoodsVo.setGoodsName(goods.getGoodsName());
@@ -487,8 +618,8 @@
                         }
                     } else if (couponType == 2 && appMemberCouponVo.getDiscountPercent() != null) {
                         discountPercent = appMemberCouponVo.getDiscountPercent();
-                        goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN).setScale(2, BigDecimal.ROUND_HALF_UP);
-                        discountMoney = goodsRealPrice.subtract(goodsTotalPrice);
+                        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) {
                         discountMoney = appMemberCouponVo.getDiscountMoney();
@@ -504,8 +635,14 @@
             appSureOrderGoodsVo.setGoodsRealPrice(goodsRealPrice);
             // 获取商品押金
             goodsDeposit = goods.getSubscription();
-            if (goodsDeposit == null) {
-                goodsDeposit = new BigDecimal("0.00");
+            if (goodsDeposit != null && goodsDeposit.compareTo(BigDecimal.ZERO) > 0) {
+                goodsDeposit = goodsDeposit.multiply(buyNumBig);
+            } else {
+                if (haveDeposit) {
+                    goodsDeposit = goodsRealPrice;
+                } else {
+                    goodsDeposit = new BigDecimal("0.00");
+                }
             }
             appSureOrderGoodsVo.setGoodsDeposit(goodsDeposit);
             // 计算商品总数量、商品总价、优惠总金额、支付押金、支付金额
@@ -533,6 +670,8 @@
             orderGoods.setServiceNum(serviceNum);
             orderGoods.setGoodsType(goods.getGoodsType());
             orderGoods.setGoodsName(goods.getGoodsName());
+            orderGoods.setGoodsTag(goods.getGoodsTags());
+            orderGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
             orderGoods.setGoodsPicture(goodsFile.getFileUrl());
             // 保存订单商品
             orderGoodsService.save(orderGoods);
@@ -567,19 +706,20 @@
         order.setReceivableMoney(orderPayMoney);
         order.setReceivableDeposit(orderPayDeposit);
         order.setChangeReceivableMoney(orderPayMoney);
-        order.setPayType(appPlaceOrderDto.getPayType());
         // 根据支付类型计算支付金额
-        if (order.getPayType() == 1) {
+        if (appPlaceOrderDto.getPayType() == 1) {
             order.setPayMoney(orderPayMoney);
             order.setOnlinePayMoney(orderPayMoney);
             appPlaceOrderVo.setPayMoney(orderPayMoney);
             appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
+            order.setPayType(1);
             order.setCloseFlag(1);
-        } else if (order.getPayType() == 2) {
+        } else if (appPlaceOrderDto.getPayType() == 2) {
             order.setPayMoney(orderPayDeposit);
             order.setOnlinePayMoney(orderPayDeposit);
             appPlaceOrderVo.setPayMoney(orderPayDeposit);
             appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
+            order.setPayType(2);
             order.setCloseFlag(0);
         }
         order.setOrderRemark(appPlaceOrderDto.getOrderRemark());
@@ -596,25 +736,129 @@
         }
         appPlaceOrderVo.setOrderId(orderId);
         appPlaceOrderVo.setOrderNo(orderNo);
-        // 调用支付
-        //使用优惠券
-        if(memberCouponSJ!=null){
+
+        String goodsName = "";
+        if (null != goods) {
+            goodsName = goods.getGoodsName();
+        }
+
+        // 小程序微信下单支付
+        createWxPayInfo(appPlaceOrderVo, userId, order.getShopId(), goodsName, orderNo,
+                orderId, order.getPayMoney(), appPlaceOrderDto.getOpenid(),
+                appPlaceOrderDto.getSpbillCreateIp(), goodsNameList);
+
+
+        //减去优惠券
+        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));
+
         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());
+        }
+    }
+
 
     /**
      * @param appPlaceActivityDto
@@ -624,6 +868,7 @@
      * @date 2023/7/6 17:59
      */
     @Override
+    @Transactional
     public AppPlaceOrderVo placeActivityOrder(AppPlaceActivityDto appPlaceActivityDto) {
         Long userId = appPlaceActivityDto.getUserId();
         // 创建订单对象
@@ -635,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();
         }
         // 定义购买数量，服务数量，商品数量
@@ -683,8 +928,8 @@
         if (activityGoodsGetVo.getAvailableBuyNum() < 1) {
             throw new ServiceException(AppErrorConstant.ACTIVITY_GOODS_NULL);
         }
-        if (buyNum < activityGoodsGetVo.getAvailableBuyNum()) {
-            throw new ServiceException(AppErrorConstant.ACTIVITY_GOODS_NULL);
+        if (activityGoodsGetVo.getAvailableBuyNum() < buyNum) {
+            throw new ServiceException(AppErrorConstant.ACTIVITY_GOODS_BEYOND);
         }
         // 创建订单ID和订单号
         String orderId = IdUtils.simpleUUID();
@@ -694,6 +939,7 @@
         String orderGoodsId;
         // 创建商品类型集合
         HashSet<String> goodsTypeSet = new HashSet<>();
+        HashSet<String> goodsNurseSet = new HashSet<>();
         // 创建商品订单对象，并设置商品ID，商品名称，商品介绍，商品类型
         appSureOrderGoodsVo = new AppSureOrderGoodsVo();
         useCoupon = 0;
@@ -724,8 +970,10 @@
         appSureOrderGoodsVo.setGoodsRealPrice(goodsRealPrice);
         // 获取商品押金
         goodsDeposit = activityGoodsGetVo.getActivitySubscription();
-        if (goodsDeposit == null) {
+        if (goodsDeposit == null || goodsDeposit.compareTo(BigDecimal.ZERO) == 0) {
             goodsDeposit = new BigDecimal("0.00");
+        } else {
+            goodsDeposit = goodsDeposit.multiply(buyNumBig);
         }
         appSureOrderGoodsVo.setGoodsDeposit(goodsDeposit);
         // 计算商品数量，订单商品金额，优惠券折扣，订单支付押金，订单支付金额
@@ -749,7 +997,9 @@
         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());
         // 保存订单商品
         orderGoodsService.save(orderGoods);
@@ -768,6 +1018,13 @@
         } else if (goods.getGoodsType() == 4) {
             goodsTypeSet.add("单品");
         }
+        String goodsNurse = goods.getGoodsNurses();
+        if (StringUtils.isNotBlank(goodsNurse)) {
+            String[] goodsNurseArr = goodsNurse.split(",");
+            for (String str : goodsNurseArr) {
+                goodsNurseSet.add(str);
+            }
+        }
         // 创建订单，并设置订单ID，删除标志，订单状态，订单号，订单来源，店铺ID，用户ID，订单金额，优惠券金额，折扣金额，应收金额，应收押金，变动应收金额，支付类型
         Order order = new Order();
         order.setOrderId(orderId);
@@ -783,19 +1040,22 @@
         order.setReceivableMoney(orderPayMoney);
         order.setReceivableDeposit(orderPayDeposit);
         order.setChangeReceivableMoney(orderPayMoney);
-        order.setPayType(appPlaceActivityDto.getPayType());
+        order.setActivityId(activityId);
+        order.setActivityName(activityGoodsGetVo.getActivityName());
         // 根据支付类型设置订单支付金额，在线支付金额，订单支付金额，未支付金额，关闭标志
-        if (order.getPayType() == 1) {
+        if (appPlaceActivityDto.getPayType() == 1) {
             order.setPayMoney(orderPayMoney);
             order.setOnlinePayMoney(orderPayMoney);
             appPlaceOrderVo.setPayMoney(orderPayMoney);
             appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
+            order.setPayType(1);
             order.setCloseFlag(1);
-        } else if (order.getPayType() == 2) {
+        } else if (appPlaceActivityDto.getPayType() == 2) {
             order.setPayMoney(orderPayDeposit);
             order.setOnlinePayMoney(orderPayDeposit);
             appPlaceOrderVo.setPayMoney(orderPayDeposit);
             appPlaceOrderVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getPayMoney()));
+            order.setPayType(2);
             order.setCloseFlag(0);
         }
         // 设置订单备注，商品数量，创建时间
@@ -805,10 +1065,11 @@
         // 保存订单
         this.save(order);
         // 更新用户商品类型
-        if (goodsTypeSet != null && goodsTypeSet.size() > 0) {
+        if (goodsTypeSet != null || goodsNurseSet != null) {
             AppMemberGoodsTypeDto appMemberGoodsTypeDto = new AppMemberGoodsTypeDto();
             appMemberGoodsTypeDto.setUserId(userId);
             appMemberGoodsTypeDto.setGoodsTypeSet(goodsTypeSet);
+            appMemberGoodsTypeDto.setGoodsNurseSet(goodsNurseSet);
             remoteMemberService.updateMemberGoodsType(appMemberGoodsTypeDto);
         }
         // 设置订单ID和订单号
@@ -824,18 +1085,65 @@
         agStockChangeDto.setUserId(order.getUserId());
         remoteActivityService.changeActivityStock(agStockChangeDto);
         // 调用支付
+        /*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();
+        // TODO 获取openID
+        payer.setOpenid("oLTPCuN5a-nBD4rAL_fa********");
+
+        request.setPayer(payer);*/
+
+        //设置订单允许分账 秒杀活动才允许分账
+        /*if(order.getOrderFrom()==2){
+            SettleInfo settleInfo=new SettleInfo();
+            settleInfo.setProfitSharing(true);
+            request.setSettleInfo(settleInfo);
+        }*/
+
+
+        //返回前端唤醒支付结果信息
+        /*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());
+*/
+        //生成活动参加记录
+        ActivityRecord activityRecord = new ActivityRecord();
+        activityRecord.setDelFlag(0);
+        activityRecord.setActivityId(activityId);
+        activityRecord.setUserId(userId);
+        activityRecord.setOrderTime(order.getCreateTime());
+        activityRecord.setOrderMoney(order.getOrderMoney());
+        activityRecord.setOrderId(orderId);
+        activityRecord.setCreateTime(new Date());
+        activityRecord.setBuyNum(orderGoods.getBuyNum());
+        activityRecord.setGoodsId(orderGoods.getGoodsId());
+        activityRecord.setActivityMoney(activityGoodsGetVo.getActivityPrice());
+        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));
         return appPlaceOrderVo;
     }
 
@@ -863,6 +1171,10 @@
                 Shop shopTemp = remoteShopService.getShop(shopIdLong).getData();
                 shopMap.put(shopIdLong, shopTemp);
             });
+            Integer delayTime = 30;
+            if (redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)) {
+                delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME);
+            }
             for (AppUserOrderPageVo appUserOrderPageVo : appUserOrderPageVoList) {
                 shop = shopMap.get(appUserOrderPageVo.getShopId());
                 appUserOrderPageVo.setShopName(shop.getShopName());
@@ -873,6 +1185,7 @@
                     appUserOrderPageVo.setSameShop(0);
                 }
                 appUserOrderPageVo.setVerifyCode("1-" + appUserOrderPageVo.getOrderId());
+                appUserOrderPageVo.setEndTime(DateUtils.addMinutes(appUserOrderPageVo.getCreateTime(), delayTime));
             }
         }
         return appUserOrderPageVoList;
@@ -897,6 +1210,8 @@
         appUserOrderGetVo.setCouponDiscount(order.getCouponMoney());
         appUserOrderGetVo.setReceivableDeposit(order.getReceivableDeposit());
         appUserOrderGetVo.setReceivableMoney(order.getReceivableMoney());
+        appUserOrderGetVo.setUnpaidMoney(order.getReceivableMoney().subtract(order.getOnlinePayMoney()));
+        appUserOrderGetVo.setPayType(order.getPayType());
         appUserOrderGetVo.setPayMoney(order.getPayMoney());
         appUserOrderGetVo.setOrderRemark(order.getOrderRemark());
         appUserOrderGetVo.setShopId(order.getShopId());
@@ -909,6 +1224,12 @@
         appUserOrderGetVo.setShopName(shop.getShopName());
         appUserOrderGetVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
         appUserOrderGetVo.setVerifyCode("1-" + orderId);
+        //生成自动取消订单延时任务
+        Integer delayTime = 30;
+        if (redisService.hasKey(SecurityConstant.AUTO_CANCEL_ORDER_TIME)) {
+            delayTime = redisService.getCacheObject(SecurityConstant.AUTO_CANCEL_ORDER_TIME);
+        }
+        appUserOrderGetVo.setEndTime(DateUtils.addMinutes(order.getCreateTime(), delayTime));
         return appUserOrderGetVo;
     }
 
@@ -920,11 +1241,15 @@
     @Override
     public void cancelOrder(String orderId) {
         Order order = this.getById(orderId);
-        if (order.getOrderStatus() == 1) {
+        // 订单状态-1.删除 0.已取消 1.待支付 2.待核销 3.已完成
+        if (order.getOrderStatus() == 0) {
+            throw new ServiceException(AppErrorConstant.CANCEL_CANCEL_ORDER);
+        } 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);
         }
     }
@@ -999,10 +1324,23 @@
         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获取用户信息
-        SysUser sysUser = remoteUserService.getSysUser(order.getUserId()).getData();
-        merVerifyOrderVo.setUserName(sysUser.getNickName());
-        merVerifyOrderVo.setUserMobile(sysUser.getPhonenumber());
+        Member member = remoteMemberService.getMember(order.getUserId()).getData();
+        merVerifyOrderVo.setUserId(order.getUserId());
+        merVerifyOrderVo.setUserName(member.getRealName());
+        merVerifyOrderVo.setUserMobile(member.getMobile());
         merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
         // 返回结果
         return merVerifyOrderVo;
@@ -1015,6 +1353,7 @@
      * @return
      */
     @Override
+    @Transactional
     public MerVerifyOrderVo sureVerifyOrder(MerVerifyOrderDto merVerifyOrderDto) {
         String orderId = merVerifyOrderDto.getOrderId();
         BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney();
@@ -1025,14 +1364,23 @@
         if (order.getOrderStatus() != 2) {
             throw new ServiceException(AppErrorConstant.VERIFY_USED);
         }
+
+        ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyOrderDto.getUserId()).getData();
+        if (!shopRelUserVo.getShopId().equals(order.getShopId())) {
+            throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
+        }
         order.setOrderStatus(3);
         order.setUseTime(nowTime);
         order.setUseUserId(merVerifyOrderDto.getUserId());
         order.setOfflinePayMoney(relPayMoney);
         order.setOffPayTime(nowTime);
         order.setPayMoney(order.getPayMoney().add(relPayMoney));
-        order.setCloseFlag(1);
         order.setChangeReceivableMoney(relReceiveMoney);
+        if (order.getPayMoney().compareTo(order.getChangeReceivableMoney()) >= 0) {
+            order.setCloseFlag(1);
+        } else {
+            order.setCloseFlag(0);
+        }
         this.saveOrUpdate(order);
         //创建服务商品
         List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listAppVoByOrderId(orderId);
@@ -1049,28 +1397,59 @@
         Goods goods;
         List<ConsumerGoods> consumerGoodsList = new ArrayList<>();
         for (AppUserOrderGoodsPageVo appUserOrderGoodsPageVo : appUserOrderGoodsPageVoList) {
-            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.setCreateTime(nowTime);
-            consumerGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
-            consumerGoods.setGoodsPicture(appUserOrderGoodsPageVo.getGoodsPicture());
-            consumerGoods.setGoodsNurses(goods.getGoodsNurses());
-            consumerGoods.setSourceFrom(1);
-            consumerGoodsList.add(consumerGoods);
+            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++) {
+                    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);
         //生成返回
@@ -1089,10 +1468,117 @@
         merVerifyOrderVo.setCreateTime(order.getCreateTime());
         merVerifyOrderVo.setPayTime(order.getPayTime());
         merVerifyOrderVo.setUseTime(order.getUseTime());
-        SysUser sysUser = remoteUserService.getSysUser(order.getUserId()).getData();
-        merVerifyOrderVo.setUserName(sysUser.getNickName());
-        merVerifyOrderVo.setUserMobile(sysUser.getPhonenumber());
+        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();
+        }
+
+        //创建支付记录
+        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);
+
+        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);
     }
 
     /**
@@ -1103,8 +1589,13 @@
      * @date 2023/6/28 11:26
      */
     @Override
+    @Transactional
     public MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto) {
         MerVerifyCouponGetVo verifyCouponGetVo = remoteCouponService.getVerifyCoupon(merVerifyCouponDto.getMemberCouponId()).getData();
+        ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyCouponDto.getUserId()).getData();
+        if (!shopRelUserVo.getShopId().equals(verifyCouponGetVo.getMemberCoupon().getShopId())) {
+            throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
+        }
         // 创建MerVerifyCouponVo对象
         MerVerifyCouponVo merVerifyCouponVo = new MerVerifyCouponVo();
         // 调用remoteCouponService的getVerifyCoupon方法获取MerVerifyCouponGetVo对象
@@ -1112,7 +1603,7 @@
         Long userId = verifyCouponGetVo.getUserId();
         // 调用remoteMemberService的getMember方法获取Member对象
         Member member = remoteMemberService.getMember(userId).getData();
-        merVerifyCouponVo.setUserName(member.getNickName());
+        merVerifyCouponVo.setUserName(member.getRealName());
         merVerifyCouponVo.setUserMobile(member.getMobile());
         merVerifyCouponVo.setCouponFrom(verifyCouponGetVo.getCouponFrom());
         merVerifyCouponVo.setCouponName(verifyCouponGetVo.getMemberCoupon().getCouponName());
@@ -1165,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();
@@ -1185,31 +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
-    public MerVerifyAwardVo sureVerifyPrize(MerVerifyPrizeDto merVerifyPrizeDto){
+    @Transactional
+    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())) {
+            throw new ServiceException(AppErrorConstant.VERIFY_SHOP_ERROR);
+        }
         Member member = remoteMemberService.getMember(memberGiftRecord.getUserId()).getData();
-        merVerifyAwardVo.setUserName(member.getNickName());
+        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()));
@@ -1258,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());
@@ -1283,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()));
@@ -1291,7 +1788,7 @@
                     merMemberNoClearOrderVo.setUnPaidMoney(zeroBig);
                 }
             }
-        }
+        }*/
         return merMemberNoClearOrderVoList;
     }
 
@@ -1303,11 +1800,23 @@
     @Override
     public void merCloseOrder(MerCloseOrderDto merCloseOrderDto) {
         Order order = this.getById(merCloseOrderDto.getOrderId());
-        order.setOfflinePayMoney(merCloseOrderDto.getPayMoney());
+        order.setOfflinePayMoney(order.getOfflinePayMoney().add(merCloseOrderDto.getPayMoney()));
         order.setOffPayTime(new Date());
         order.setPayMoney(order.getPayMoney().add(merCloseOrderDto.getPayMoney()));
-        order.setCloseFlag(1);
+        if (order.getPayMoney().compareTo(order.getChangeReceivableMoney()) >= 0) {
+            order.setCloseFlag(0);
+        } else {
+            order.setCloseFlag(1);
+        }
         this.saveOrUpdate(order);
+        //创建支付记录
+        PayRecord payRecord = new PayRecord();
+        payRecord.setDelFlag(0);
+        payRecord.setOrderId(order.getOrderId());
+        payRecord.setPayMoney(merCloseOrderDto.getPayMoney());
+        payRecord.setPayTime(new Date());
+        payRecord.setPayType(merCloseOrderDto.getPayType());
+        payRecordService.save(payRecord);
     }
 
     /**
@@ -1319,6 +1828,8 @@
     public void createNewOrder(MerNewOrderDto merNewOrderDto) {
         Long userId = merNewOrderDto.getBuyUserId();
         Date nowTime = new Date();
+        Long shopId = merNewOrderDto.getShopId();
+        Shop shop = remoteShopService.getShop(shopId).getData();
         //如果非指定用户判断是否需要通过手机号创建新用户
         if (userId == null) {
             String name = merNewOrderDto.getName();
@@ -1346,6 +1857,9 @@
                 member.setMobile(mobile);
                 member.setRealName(name);
                 member.setNickName(name);
+                member.setBindingFlag(1);
+                member.setRelationShopId(shopId);
+                member.setRelationShopName(shop.getShopName());
                 remoteMemberService.createNewMember(member);
             }
             userId = sysUser.getUserId();
@@ -1362,9 +1876,10 @@
         BigDecimal goodsPrice;
         BigDecimal goodsTotalPrice;
         BigDecimal goodsRealPrice;
-        Long shopId = merNewOrderDto.getShopId();
-        Shop shop = remoteShopService.getShop(shopId).getData();
-        List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(userId).getData();
+        MerBaseDto merBaseDto = new MerBaseDto();
+        merBaseDto.setUserId(userId);
+        merBaseDto.setShopId(shopId);
+        List<AppMemberCouponVo> appMemberCouponVoList = remoteCouponService.listVoMemberCouponByUserId(merBaseDto).getData();
         Map<String, AppMemberCouponVo> appMemberCouponVoMap = new HashMap<>();
         if (null != appMemberCouponVoList) {
             appMemberCouponVoMap = appMemberCouponVoList.stream().collect(Collectors.toMap(AppMemberCouponVo::getMemberCouponId, Function.identity()));
@@ -1421,7 +1936,7 @@
                         }
                     } else if (couponType == 2 && appMemberCouponVo.getDiscountPercent() != null) {
                         discountPercent = appMemberCouponVo.getDiscountPercent();
-                        goodsRealPrice = goodsTotalPrice.multiply(discountPercent).divide(BigDecimal.TEN).setScale(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();
@@ -1431,8 +1946,10 @@
             }
 
             goodsDeposit = goods.getSubscription();
-            if (goodsDeposit == null) {
+            if (goodsDeposit == null || goodsDeposit.compareTo(BigDecimal.ZERO) == 0) {
                 goodsDeposit = new BigDecimal("0.00");
+            } else {
+                goodsDeposit = goodsDeposit.multiply(buyNumBig);
             }
             goodsNum = goodsNum + buyNum;
             orderGoodsMoney = orderGoodsMoney.add(goodsTotalPrice);
@@ -1456,7 +1973,9 @@
             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());
             orderGoodsService.save(orderGoods);
             switch (orderGoods.getGoodsType()) {
@@ -1499,46 +2018,83 @@
         order.setPayMoney(orderPayMoney);
         order.setOnlinePayMoney(new BigDecimal("0.00"));
         order.setOfflinePayMoney(orderPayMoney);
-        order.setCloseFlag(1);
         order.setOrderRemark(merNewOrderDto.getOrderRemark());
         order.setGoodsNum(goodsNum);
         order.setCreateTime(nowTime);
-        order.setPayTime(nowTime);
         order.setUseTime(nowTime);
         order.setUseUserId(merNewOrderDto.getUserId());
         order.setPayMoney(merNewOrderDto.getPayMoney());
         order.setOnlinePayMoney(new BigDecimal("0.00"));
         order.setOfflinePayMoney(merNewOrderDto.getPayMoney());
         order.setOffPayTime(nowTime);
-        order.setCloseFlag(1);
+        order.setPayType(1);
+        if (order.getPayMoney().compareTo(order.getChangeReceivableMoney()) >= 0) {
+            order.setCloseFlag(0);
+        } else {
+            order.setCloseFlag(1);
+        }
         this.save(order);
         //创建服务
         List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listAppVoByOrderId(orderId);
         ConsumerGoods consumerGoods;
         String consumerGoodsId;
+        List<ConsumerGoods> consumerGoodsList = new ArrayList<>();
         for (AppUserOrderGoodsPageVo appUserOrderGoodsPageVo : appUserOrderGoodsPageVoList) {
-            consumerGoods = new ConsumerGoods();
-            goods = remoteGoodsService.getGoods(appUserOrderGoodsPageVo.getGoodsId()).getData();
-            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.setCreateTime(nowTime);
-            consumerGoods.setGoodsIntroduction(goods.getGoodsIntroduction());
-            consumerGoods.setGoodsPicture(appUserOrderGoodsPageVo.getGoodsPicture());
-            consumerGoods.setGoodsNurses(goods.getGoodsNurses());
-            consumerGoodsService.save(consumerGoods);
+            Integer buyGoodsNum = appUserOrderGoodsPageVo.getBuyNum();
+            if (appUserOrderGoodsPageVo.getCycleNumFlag() == 0) {
+                consumerGoods = new ConsumerGoods();
+                goods = remoteGoodsService.getGoods(appUserOrderGoodsPageVo.getGoodsId()).getData();
+                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(buyGoodsNum);
+                consumerGoodsList.add(consumerGoods);
+            } else {
+                for (int i = 0; i < buyGoodsNum; i++) {
+                    consumerGoods = new ConsumerGoods();
+                    goods = remoteGoodsService.getGoods(appUserOrderGoodsPageVo.getGoodsId()).getData();
+                    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);
         Member member = remoteMemberService.getMember(userId).getData();
         if (member != null && member.getBindingFlag() != 1) {
             //绑定商户
@@ -1557,6 +2113,14 @@
         shopTotalChangeDto.setExperienceMoney(experienceMoney);
         shopTotalChangeDto.setGoodsMoney(goodsMoney);
         remoteShopService.changeShopTotal(shopTotalChangeDto);
+        //创建支付记录
+        PayRecord payRecord = new PayRecord();
+        payRecord.setDelFlag(0);
+        payRecord.setOrderId(orderId);
+        payRecord.setPayMoney(order.getPayMoney());
+        payRecord.setPayTime(order.getPayTime());
+        payRecord.setPayType(2);
+        payRecordService.save(payRecord);
     }
 
 
@@ -1566,6 +2130,18 @@
      */
     @Override
     public List<MerOrderPageVo> pageMerOrder(Page page, MerOrderPageDto merOrderPageDto) {
+        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);
+            }
+        }
         List<MerOrderPageVo> merOrderPageVoList = orderMapper.pageMerOrder(page, merOrderPageDto);
         if (merOrderPageVoList != null && !merOrderPageVoList.isEmpty()) {
             Long userId;
@@ -1581,6 +2157,9 @@
                 if (orderFrom != null) {
                     if (orderFrom == 1) {
                         orderFromDesc = "商城订单";
+                    } else if(orderFrom == 2){
+
+                        orderFromDesc = "店铺砍价活动("+merOrderPageVo.getActivityName()+")";
                     } else {
                         orderFromDesc = "线下创建";
                     }
@@ -1588,7 +2167,7 @@
                     orderFromDesc = "商城订单";
                 }
                 merOrderPageVo.setOrderFromDesc(orderFromDesc);
-                merOrderPageVo.setUnPaidMoney(merOrderPageVo.getReceivableMoney().subtract(merOrderPageVo.getPayMoney()));
+                merOrderPageVo.setUnPaidMoney(merOrderPageVo.getPayMoney().subtract(merOrderPageVo.getReceiveMoney()));
                 if (merOrderPageVo.getUnPaidMoney() == null) {
                     merOrderPageVo.setUnPaidMoney(zeroBig);
                 }
@@ -1599,8 +2178,13 @@
             Map<Long, MgtSimpleMemberVo> userMap = simpleMemberVoList.stream()
                     .collect(Collectors.toMap(MgtSimpleMemberVo::getUserId, Function.identity()));
             for (MerOrderPageVo merOrderPageVo : merOrderPageVoList) {
-                merOrderPageVo.setUserName(userMap.get(merOrderPageVo.getUserId()).getNickName());
-                merOrderPageVo.setUserMobile(userMap.get(merOrderPageVo.getUserId()).getUserMobile());
+                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;
@@ -1653,6 +2237,7 @@
         if (mgtMemberOrderPageVoList != null && !mgtMemberOrderPageVoList.isEmpty()) {
             Long shopId;
             HashSet<String> set = new HashSet<>();
+            BigDecimal zeroBig = new BigDecimal("0.00");
             // 遍历MgtMemberOrderPageVoList，获取shopId并添加到set中
             for (MgtMemberOrderPageVo mgtMemberOrderPageVo : mgtMemberOrderPageVoList) {
                 shopId = mgtMemberOrderPageVo.getShopId();
@@ -1671,6 +2256,8 @@
             for (MgtMemberOrderPageVo mgtMemberOrderPageVo : mgtMemberOrderPageVoList) {
                 shopId = mgtMemberOrderPageVo.getShopId();
                 mgtMemberOrderPageVo.setShopName(map.get(shopId).getShopName());
+                BigDecimal unPaidMoney = mgtMemberOrderPageVo.getReceivableMoney().subtract(mgtMemberOrderPageVo.getPayMoney());
+                mgtMemberOrderPageVo.setUnPaidMoney(unPaidMoney == null ? zeroBig : unPaidMoney);
             }
         }
         // 返回MgtMemberOrderPageVoList
@@ -1738,7 +2325,9 @@
             for (MgtActivityOrderPageVo mgtActivityOrderPageVo : activityOrderPageVoList) {
                 mgtActivityOrderPageVo.setShopName(shopMap.get(mgtActivityOrderPageVo.getShopId()).getShopName());
                 if (userMap.get(mgtActivityOrderPageVo.getUserId()) != null) {
-                    mgtActivityOrderPageVo.setUserName(userMap.get(mgtActivityOrderPageVo.getUserId()).getNickName());
+                    mgtActivityOrderPageVo.setNickName(userMap.get(mgtActivityOrderPageVo.getUserId()).getNickName());
+                    mgtActivityOrderPageVo.setUserName(userMap.get(mgtActivityOrderPageVo.getUserId()).getRealName());
+                    mgtActivityOrderPageVo.setUserMobile(userMap.get(mgtActivityOrderPageVo.getUserId()).getUserMobile());
                 }
                 BigDecimal unPaidMoney = mgtActivityOrderPageVo.getReceivableMoney().subtract(mgtActivityOrderPageVo.getPayMoney());
                 mgtActivityOrderPageVo.setUnPaidMoney(unPaidMoney == null ? zeroBig : unPaidMoney);
@@ -1778,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());
@@ -1862,7 +2451,9 @@
                 }
                 if (userMap != null && !userMap.isEmpty()) {
                     if (userMap.get(mgtShopOrderPageVo.getUserId()) != null) {
-                        mgtShopOrderPageVo.setUserName(userMap.get(mgtShopOrderPageVo.getUserId()).getNickName());
+                        mgtShopOrderPageVo.setNickName(userMap.get(mgtShopOrderPageVo.getUserId()).getNickName());
+                        mgtShopOrderPageVo.setUserName(userMap.get(mgtShopOrderPageVo.getUserId()).getRealName());
+                        mgtShopOrderPageVo.setUserMobile(userMap.get(mgtShopOrderPageVo.getUserId()).getUserMobile());
                     }
                 }
                 BigDecimal unPaidMoney = mgtShopOrderPageVo.getReceivableMoney().subtract(mgtShopOrderPageVo.getPayMoney());
@@ -1959,8 +2550,15 @@
         mgtOrderDetailVo.setCancelTime(order.getCancelTime());
         mgtOrderDetailVo.setOrderRemark(order.getOrderRemark());
         mgtOrderDetailVo.setShopId(order.getShopId());
-        mgtOrderDetailVo.setShopName(shop.getShopName());
+        if (shop != null) {
+            mgtOrderDetailVo.setShopName(shop.getShopName());
+        } else {
+            mgtOrderDetailVo.setShopName("商户已被删除");
+        }
         mgtOrderDetailVo.setVerifyTime(order.getUseTime());
+        //获取支付记录
+        List<MgtOrderPayListVo> orderPayListVoList = payRecordService.listMgtOrderPayVo(orderId);
+        mgtOrderDetailVo.setOrderPayListVoList(orderPayListVoList);
         return mgtOrderDetailVo;
     }
 
@@ -1974,6 +2572,8 @@
     @Override
     public MgtBulletinBoardVo boardOrderTotal() {
         MgtBulletinBoardVo mgtBulletinBoardVo = orderMapper.boardOrderTotal();
+        Integer activityUserTotal = orderMapper.activityUserTotal();
+        mgtBulletinBoardVo.setActivityUserTotal(activityUserTotal);
         return mgtBulletinBoardVo;
     }
 
@@ -2541,17 +3141,21 @@
             throw new ServiceException(AppErrorConstant.COUPON_EXPIRED);
         } else if (couponStatus == 2) {
             throw new ServiceException(AppErrorConstant.COUPON_USED);
-        } else if (couponStatus != 0) {
+        } else if (couponStatus != 1) {
             throw new ServiceException(AppErrorConstant.COUPON_NO_FIND);
         }
-        if (!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) {
+            memberCoupon.setShopId(shopId);
         }
         List<Goods> goodsList = verifyCouponGetVo.getGoodsList();
         Long userId = verifyCouponGetVo.getUserId();
         // 调用remoteMemberService的getMember方法获取Member对象
         Member member = remoteMemberService.getMember(userId).getData();
-        merVerifyCouponVo.setUserName(member.getNickName());
+        merVerifyCouponVo.setUserName(member.getRealName());
         merVerifyCouponVo.setUserMobile(member.getMobile());
         merVerifyCouponVo.setCouponFrom(verifyCouponGetVo.getCouponFrom());
         merVerifyCouponVo.setCouponName(verifyCouponGetVo.getMemberCoupon().getCouponName());
@@ -2582,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.getNickName());
+        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()));
@@ -2705,9 +3309,9 @@
         }
         MerOrderDistributionTotalVo orderDistributionTotalVo = new MerOrderDistributionTotalVo();
         // 获取订单年龄用户列表
-        List<MerOrderAgeUserVo> orderAgeUserVoList = remoteMemberService.listOrderAgeUser(merTotalDto).getData();
+        //List<MerOrderAgeUserVo> orderAgeUserVoList = remoteMemberService.listOrderAgeUser(merTotalDto).getData();
         // 如果订单年龄用户列表不为空
-        if (orderAgeUserVoList != null && !orderAgeUserVoList.isEmpty()) {
+        /*if (orderAgeUserVoList != null && !orderAgeUserVoList.isEmpty()) {
             // 定义变量
             Integer ageType;
             List<Long> userIdList;
@@ -2748,8 +3352,19 @@
                     orderTotalValue[i] = 0;
                     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);
@@ -2858,15 +3473,29 @@
     }
 
     /**
-     * @param merBaseDto
+     * @param merOrderPageDto
      * @return MerTotalOrderVo
      * @description 商户端订单管理统计
      * @author jqs
-     * @date 2023/7/4 16:27
+     * @date 2023/7/31 10:53
      */
     @Override
-    public MerTotalOrderVo totalMerOrder(MerBaseDto merBaseDto) {
-        return orderMapper.totalMerOrder(merBaseDto.getShopId());
+    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;
     }
 
     /**
@@ -2928,32 +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
-    public void autoCancelOrder(String orderId){
+    @Transactional
+    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();
                     }
                     //改变活动库存
@@ -2965,18 +3595,25 @@
                     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){
+        } 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());
 
                     }
@@ -2986,15 +3623,17 @@
     }
 
     /**
-     * @description  订单支付回调
-     * @author  jqs
-     * @date    2023/7/13 17:57
-     * @param orderId
-     * @return  void
+     * @param transaction
+     * @return void
+     * @description 订单支付回调
+     * @author jqs
+     * @date 2023/7/13 17:57
      */
     @Override
-    public void payBack(String orderId) {
+    @Transactional
+    public void payBack(PartnerTransactionsResult transaction) {
         // 更新订单状态
+        String orderId = transaction.getOutTradeNo();
         Order order = this.getById(orderId);
         order.setOrderStatus(2);
         order.setPayTime(new Date());
@@ -3011,6 +3650,8 @@
         Boolean haveGoods = false;
         // 获取订单中的所有商品
         List<OrderGoods> orderGoodsList = orderGoodsService.listByOrderId(orderId);
+        List<GoodsTotalChangeDto> goodsTotalChangeDtoList = new ArrayList<>();
+        GoodsTotalChangeDto goodsTotalChangeDto;
         // 遍历订单中的所有商品，根据商品类型累加收款金额，并标记商品存在状态
         for (OrderGoods orderGoods : orderGoodsList) {
             switch (orderGoods.getGoodsType()) {
@@ -3033,7 +3674,18 @@
                 default:
                     break;
             }
+            goodsTotalChangeDto = new GoodsTotalChangeDto();
+            goodsTotalChangeDto.setGoodsId(orderGoods.getGoodsId());
+            goodsTotalChangeDto.setChangeType(1);
+            goodsTotalChangeDto.setChangeNum(orderGoods.getBuyNum());
+            goodsTotalChangeDto.setMoney(orderGoods.getGoodsReceivableMoney());
+            Integer bugGoodsNum = orderMapper.countUserBuyGoodsNum(order.getUserId(), orderGoods.getGoodsId());
+            if (bugGoodsNum == null || bugGoodsNum < 1) {
+                goodsTotalChangeDto.setPersonNum(1);
+            }
+            goodsTotalChangeDtoList.add(goodsTotalChangeDto);
         }
+        //更新商品统计
         // 更新商户统计信息
         ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
         shopTotalChangeDto.setShopId(order.getShopId());
@@ -3071,6 +3723,9 @@
         if (haveGoods) {
             memberTotalChangeDto.setGoodsOrderChange(1);
         }
+        if(order.getOrderFrom()==2){
+            memberTotalChangeDto.setActivityTime(order.getCreateTime());
+        }
         // 更新会员统计信息
         remoteMemberService.changeMemberTotal(memberTotalChangeDto);
         // 如果订单来源于活动，则更新活动统计信息
@@ -3088,19 +3743,37 @@
             }
             activityTotalChangeDto.setUserId(order.getUserId());
             remoteActivityService.changeActivityTotal(activityTotalChangeDto);
+
+
+            //活动订单进行分账
+            /*ProfitSharingApplyRequest request=new ProfitSharingApplyRequest();
+            request.setAppid(this.appId);
+            request.setSubMchid("");
+            request.setTransactionId(transaction.getTransactionId());
+            profitsSharingService.applyProfitSharing(request);*/
         }
+        //生成支付记录
+        OrderPayment orderPayment = new OrderPayment();
+        PayRecord payRecord = new PayRecord();
+        payRecord.setDelFlag(0);
+        payRecord.setOrderId(orderId);
+        payRecord.setPayMoney(order.getPayMoney());
+        payRecord.setPayTime(order.getPayTime());
+        payRecord.setPayType(1);
+        payRecordService.save(payRecord);
     }
 
     /**
-     * @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
-    public void refundOrder(String orderId){
-        //更新订单信息
+    @Transactional
+    public void refundOrder(String orderId) {
+        // 更新订单信息
         Order order = this.getById(orderId);
         order.setOrderStatus(0);
         order.setCancelTime(new Date());
@@ -3113,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());
         // 初始化各类商品的收款金额
@@ -3127,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();
                     }
                     //改变活动库存
@@ -3151,7 +3824,14 @@
                     agStockChangeDto.setShopId(order.getShopId());
                     agStockChangeDto.setUserId(order.getUserId());
                     remoteActivityService.changeActivityStock(agStockChangeDto);
-                }else{
+                    //删除活动记录
+                    ActivityRecord activityRecord = new ActivityRecord();
+                    activityRecord.setActivityId(order.getActivityId());
+                    activityRecord.setGoodsId(orderGoods.getGoodsId());
+                    activityRecord.setUserId(order.getUserId());
+                    activityRecord.setOrderTime(order.getCreateTime());
+                    remoteActivityService.delActivityRecord(activityRecord);
+                } else {
                     memberCouponSJ.add(orderGoods.getCouponId());
                 }
                 switch (orderGoods.getGoodsType()) {
@@ -3176,7 +3856,7 @@
                 }
             }
             //回退优惠券
-            if(memberCouponSJ!=null){
+            if (memberCouponSJ != null) {
                 remoteCouponService.backMemberCoupon(memberCouponSJ.toString());
             }
         }
@@ -3235,5 +3915,483 @@
             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);
+    }
+
+    /**
+     * 申请退款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
+     * @description 员工端活动订单统计
+     * @author jqs
+     * @date 2023/7/17 15:25
+     */
+    @Override
+    public StaffActivityOrderTotalVo getStaffActivityOrderTotal(StaffTotalDto staffTotalDto) {
+        StaffActivityOrderTotalVo staffActivityOrderTotalVo = orderMapper.getStaffActivityOrderTotal(staffTotalDto);
+        return staffActivityOrderTotalVo;
+    }
+
+    /**
+     * @param staffTotalDto
+     * @return StaffActivityTotalVo
+     * @description 员工端活动统计
+     * @author jqs
+     * @date 2023/7/17 15:51
+     */
+    @Override
+    public StaffActivityTotalVo getStaffActivityTotal(StaffTotalDto staffTotalDto) {
+        StaffActivityTotalVo staffActivityTotalVo = orderMapper.getStaffActivityTotal(staffTotalDto);
+        return staffActivityTotalVo;
+    }
+
+    /**
+     * @param staffTotalDto
+     * @return MerOrderDistributionTotalVo
+     * @description 员工端活动统计订单分布
+     * @author jqs
+     * @date 2023/7/17 16:16
+     */
+    @Override
+    public MerOrderDistributionTotalVo getStaffOrderDistributionTotal(StaffTotalDto staffTotalDto) {
+        MerOrderDistributionTotalVo orderDistributionTotalVo = new MerOrderDistributionTotalVo();
+        // 获取订单年龄用户列表
+        MerTotalDto merTotalDto = new MerTotalDto();
+        merTotalDto.setShopId(staffTotalDto.getShopId());
+        List<MerOrderAgeUserVo> orderAgeUserVoList = remoteMemberService.listOrderAgeUser(merTotalDto).getData();
+        // 如果订单年龄用户列表不为空
+        if (orderAgeUserVoList != null && !orderAgeUserVoList.isEmpty()) {
+            // 定义变量
+            Integer ageType;
+            List<Long> userIdList;
+            MerOrderAgeUserVo orderAgeUserVo;
+            MgtMapTotalPlusVo mgtMapTotalPlusVo;
+            String[] orderTotalKey = new String[5];
+            Integer[] orderTotalValue = new Integer[5];
+            BigDecimal[] orderMoneyValue = new BigDecimal[5];
+            // 遍历订单年龄用户列表
+            for (int i = 0; i < orderAgeUserVoList.size(); i++) {
+                orderAgeUserVo = orderAgeUserVoList.get(i);
+                ageType = orderAgeUserVo.getAgeType();
+                userIdList = orderAgeUserVo.getUserIdList();
+                // 根据年龄类型设置订单总数键
+                switch (ageType) {
+                    case 1:
+                        orderTotalKey[i] = "<20";
+                        break;
+                    case 2:
+                        orderTotalKey[i] = "21-30";
+                        break;
+                    case 3:
+                        orderTotalKey[i] = "31-40";
+                        break;
+                    case 4:
+                        orderTotalKey[i] = "41-50";
+                        break;
+                    case 5:
+                        orderTotalKey[i] = ">50";
+                        break;
+                }
+                // 如果用户ID列表不为空
+                if (userIdList != null && !userIdList.isEmpty()) {
+                    mgtMapTotalPlusVo = orderMapper.listStaffActivityOrderDistributionTotal(userIdList, staffTotalDto.getShopId(), staffTotalDto.getActivityId());
+                    orderTotalValue[i] = mgtMapTotalPlusVo.getMapValueFirst();
+                    orderMoneyValue[i] = mgtMapTotalPlusVo.getMapValueSecond();
+                } else {
+                    orderTotalValue[i] = 0;
+                    orderMoneyValue[i] = BigDecimal.ZERO;
+                }
+            }
+            // 设置订单分布总数对象的属性值
+            orderDistributionTotalVo.setOrderTotalKey(orderTotalKey);
+            orderDistributionTotalVo.setOrderTotalValue(orderTotalValue);
+            orderDistributionTotalVo.setOrderMoneyValue(orderMoneyValue);
+        }
+        // 返回订单分布总数对象
+        return orderDistributionTotalVo;
+    }
+
+
+    /**
+     * @param staffTotalDto
+     * @return MerOrderTypeTotalVo
+     * @description 员工端活动统计销售占比
+     * @author jqs
+     * @date 2023/7/17 17:03
+     */
+    @Override
+    public MerOrderTypeTotalVo getStaffOrderTypeTotal(StaffTotalDto staffTotalDto) {
+        MerOrderTypeTotalVo orderTypeTotalVo = new MerOrderTypeTotalVo();
+        //获取商品分类销售数据
+        List<MgtMapTotalPlusVo> MgtMapIntTotalVoGoodsType = orderMapper.listStaffOrderTotalGoodsType(staffTotalDto);
+        List<MgtMapIntTotalVo> goodsTypeTotalList = new ArrayList<>();
+        List<MgtMapBigTotalVo> goodsTypeMoneyList = new ArrayList<>();
+        if (MgtMapIntTotalVoGoodsType != null && MgtMapIntTotalVoGoodsType.size() > 0) {
+            MgtMapIntTotalVo MgtMapIntTotalVo;
+            MgtMapBigTotalVo mgtMapBigTotalVo;
+            // 遍历不同商品类型的会员数列表，设置商品类型数组和对应的会员数数组
+            for (int i = 0; i < MgtMapIntTotalVoGoodsType.size(); i++) {
+                MgtMapIntTotalVo = new MgtMapIntTotalVo();
+                mgtMapBigTotalVo = new MgtMapBigTotalVo();
+                MgtMapIntTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                mgtMapBigTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond());
+                if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("1")) {
+                    MgtMapIntTotalVo.setMapKey("周期");
+                    mgtMapBigTotalVo.setMapKey("周期");
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("2")) {
+                    MgtMapIntTotalVo.setMapKey("服务");
+                    mgtMapBigTotalVo.setMapKey("服务");
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("3")) {
+                    MgtMapIntTotalVo.setMapKey("体验");
+                    mgtMapBigTotalVo.setMapKey("体验");
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("4")) {
+                    MgtMapIntTotalVo.setMapKey("单品");
+                    mgtMapBigTotalVo.setMapKey("单品");
+                }
+                goodsTypeTotalList.add(MgtMapIntTotalVo);
+                goodsTypeMoneyList.add(mgtMapBigTotalVo);
+            }
+            orderTypeTotalVo.setGoodsTypeTotalList(goodsTypeTotalList);
+            orderTypeTotalVo.setGoodsTypeMoneyList(goodsTypeMoneyList);
+        }
+        return orderTypeTotalVo;
+    }
+
+    /**
+     * @param staffTotalDto
+     * @return StaffActivityDateMemberTotalVo
+     * @description 员工端获客人数
+     * @author jqs
+     * @date 2023/7/17 18:42
+     */
+    @Override
+    public StaffActivityDateMemberTotalVo getStaffActivityGetMemberTotal(StaffTotalDto staffTotalDto) {
+        // 创建返回对象
+        StaffActivityDateMemberTotalVo staffActivityDateMemberTotalVo = new StaffActivityDateMemberTotalVo();
+        // 查询数据库获取数据
+        List<MgtMapIntTotalVo> mgtMapIntTotalVoList = orderMapper.getStaffActivityGetMemberTotal(staffTotalDto);
+        // 将查询结果转为Map
+        Map<String, Integer> map = new HashMap<>();
+        if (mgtMapIntTotalVoList != null && !mgtMapIntTotalVoList.isEmpty()) {
+            map = mgtMapIntTotalVoList.stream()
+                    .collect(Collectors.toMap(MgtMapIntTotalVo::getMapKey, MgtMapIntTotalVo::getMapValue));
+        }
+        // 获取日期范围
+        List<String> dateList = getDateRange(staffTotalDto.getStartDate(), staffTotalDto.getEndDate());
+        int size = dateList.size();
+        // 创建日期和成员总数的数组
+        String[] dateMemberTotalKey = new String[size];
+        Integer[] dateMemberTotalValue = new Integer[size];
+        // 遍历日期列表，设置日期和成员总数的数组
+        String str;
+        Integer value;
+        for (int i = 0; i < size; i++) {
+            str = dateList.get(i);
+            dateMemberTotalKey[i] = str;
+            value = map.get(str);
+            dateMemberTotalValue[i] = (value != null) ? value : 0;
+        }
+        // 设置返回对象的日期和成员总数数组
+        staffActivityDateMemberTotalVo.setDateMemberTotalKey(dateMemberTotalKey);
+        staffActivityDateMemberTotalVo.setDateMemberTotalValue(dateMemberTotalValue);
+        // 返回结果对象
+        return staffActivityDateMemberTotalVo;
+    }
+
+    /**
+     * @param staffTotalDto
+     * @return StaffActivityDateMemberTotalVo
+     * @description 员工端获客人数
+     * @author jqs
+     * @date 2023/7/17 18:42
+     */
+    @Override
+    public StaffActivityDateMemberTotalVo getStaffActivityMemberTotal(StaffTotalDto staffTotalDto) {
+        // 创建返回对象
+        StaffActivityDateMemberTotalVo staffActivityDateMemberTotalVo = new StaffActivityDateMemberTotalVo();
+        // 查询数据库获取数据
+        List<MgtMapIntTotalVo> mgtMapIntTotalVoList = orderMapper.getStaffActivityMemberTotal(staffTotalDto);
+        // 将查询结果转为Map
+        Map<String, Integer> map = new HashMap<>();
+        if (mgtMapIntTotalVoList != null && !mgtMapIntTotalVoList.isEmpty()) {
+            map = mgtMapIntTotalVoList.stream()
+                    .collect(Collectors.toMap(MgtMapIntTotalVo::getMapKey, MgtMapIntTotalVo::getMapValue));
+        }
+        // 获取日期范围
+        List<String> dateList = getDateRange(staffTotalDto.getStartDate(), staffTotalDto.getEndDate());
+        int size = dateList.size();
+        // 创建日期和成员总数的数组
+        String[] dateMemberTotalKey = new String[size];
+        Integer[] dateMemberTotalValue = new Integer[size];
+        // 遍历日期列表，设置日期和成员总数的数组
+        String str;
+        Integer value;
+        for (int i = 0; i < size; i++) {
+            str = dateList.get(i);
+            dateMemberTotalKey[i] = str;
+            value = map.get(str);
+            dateMemberTotalValue[i] = (value != null) ? value : 0;
+        }
+        // 设置返回对象的日期和成员总数数组
+        staffActivityDateMemberTotalVo.setDateMemberTotalKey(dateMemberTotalKey);
+        staffActivityDateMemberTotalVo.setDateMemberTotalValue(dateMemberTotalValue);
+        // 返回结果对象
+        return staffActivityDateMemberTotalVo;
+    }
+
+    /**
+     * @param startDate
+     * @param endDate
+     * @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<>();
+        LocalDate start = LocalDate.parse(startDate);
+        LocalDate end = LocalDate.parse(endDate);
+        while (!start.isAfter(end)) {
+            dateList.add(start.format(DateTimeFormatter.ISO_DATE));
+            start = start.plusDays(1);
+        }
+        return dateList;
+    }
+
+    /**
+     * @param
+     * @return void
+     * @description 检查订单状态定时任务
+     * @author jqs
+     * @date 2023/7/25 14:40
+     */
+    @Override
+    public void checkOrderStatus() {
+        Integer delayTime = 30;
+        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);
+        LambdaQueryWrapper<Order> queryWrapper = new LambdaQueryWrapper<>();
+        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) {
+                autoTimeCancelOrder(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) {
+            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());
+                        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());
+
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * @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;
     }
 }

--
Gitblit v1.7.1