From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java |  417 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 258 insertions(+), 159 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 c9a3204..a6a1a73 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
@@ -529,9 +529,13 @@
      */
     @Override
     public MerVerifyOrderVo verifyOrder(String orderId) {
+        // 创建返回对象
         MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
+        // 根据订单ID获取订单信息
         Order order = this.getById(orderId);
+        // 根据订单ID获取订单商品列表
         List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList = orderGoodsService.listAppVoByOrderId(orderId);
+        // 设置返回对象的属性值
         merVerifyOrderVo.setOrderId(orderId);
         merVerifyOrderVo.setOrderNo(order.getOrderNo());
         merVerifyOrderVo.setOrderStatus(order.getOrderStatus());
@@ -546,10 +550,12 @@
         merVerifyOrderVo.setPayTime(order.getPayTime());
         merVerifyOrderVo.setUseTime(order.getUseTime());
         merVerifyOrderVo.setAppUserOrderGoodsPageVoList(appUserOrderGoodsPageVoList);
+        // 根据订单用户ID获取用户信息
         SysUser sysUser = remoteUserService.getSysUser(order.getUserId()).getData();
         merVerifyOrderVo.setUserName(sysUser.getNickName());
         merVerifyOrderVo.setUserMobile(sysUser.getPhonenumber());
         merVerifyOrderVo.setCloseFlag(order.getCloseFlag());
+        // 返回结果
         return merVerifyOrderVo;
     }
 
@@ -583,11 +589,19 @@
         }
         String goodsIds = goodsIdSj.toString();
         List<Goods> goodsList = remoteGoodsService.listGoodsByGoodsId(goodsIds).getData();
-        Map<String,Goods> goodsMap = goodsList.stream()
+        Map<String, Goods> goodsMap = goodsList.stream()
                 .collect(Collectors.toMap(Goods::getGoodsId, Function.identity()));
         ConsumerGoods consumerGoods;
         String consumerGoodsId;
         Goods goods;
+        Integer serviceCount = 0;
+        Integer cycleService = 0;
+        Integer cyclePerson = 0;
+        Integer serviceService = 0;
+        Integer servicePerson = 0;
+        Integer experienceService = 0;
+        Integer experiencePerson = 0;
+        MerMemberConsumerGoodsTotalVo memberConsumerGoodsTotalVo = consumerGoodsService.getMemberConsumerGoodsTotalVo(order.getUserId(), order.getShopId());
         for (AppUserOrderGoodsPageVo appUserOrderGoodsPageVo : appUserOrderGoodsPageVoList) {
             consumerGoods = new ConsumerGoods();
             goods = goodsMap.get(appUserOrderGoodsPageVo.getGoodsId());
@@ -611,7 +625,34 @@
             consumerGoods.setGoodsNurses(goods.getGoodsNurses());
             consumerGoods.setSourceFrom(1);
             consumerGoodsService.save(consumerGoods);
+            //处理商品服务次数
+            if (consumerGoods.getCycleNumFlag() == 1) {
+                switch (goods.getGoodsType()) {
+                    case 1:
+                        cycleService = cycleService + appUserOrderGoodsPageVo.getServiceNum();
+                        break;
+                    case 2:
+                        serviceService = serviceService + appUserOrderGoodsPageVo.getServiceNum();
+                        break;
+                    case 3:
+                        experienceService = experienceService + appUserOrderGoodsPageVo.getServiceNum();
+                        break;
+                    default:
+                        break;
+                }
+            }
         }
+        //判断是否加人
+        if (cycleService > 0 && memberConsumerGoodsTotalVo.getCycleOrder() == 0) {
+            cyclePerson = 1;
+        }
+        if (serviceService > 0 && memberConsumerGoodsTotalVo.getServiceOrder() == 0) {
+            servicePerson = 1;
+        }
+        if (experienceService > 0 && memberConsumerGoodsTotalVo.getExperienceOrder() == 0) {
+            experiencePerson = 1;
+        }
+        serviceCount = cycleService + serviceService + experienceService;
         //生成返回
         MerVerifyOrderVo merVerifyOrderVo = new MerVerifyOrderVo();
         merVerifyOrderVo.setOrderId(orderId);
@@ -631,18 +672,36 @@
         SysUser sysUser = remoteUserService.getSysUser(order.getUserId()).getData();
         merVerifyOrderVo.setUserName(sysUser.getNickName());
         merVerifyOrderVo.setUserMobile(sysUser.getPhonenumber());
+        //更新商户和会员服务统计
+        MemberTotalChangeDto memberTotalChangeDto = new MemberTotalChangeDto();
+        memberTotalChangeDto.setUserId(order.getUserId());
+        memberTotalChangeDto.setTypeService(1);
+        memberTotalChangeDto.setServiceCount(serviceCount);
+        remoteMemberService.changeMemberTotal(memberTotalChangeDto);
+        ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
+        shopTotalChangeDto.setShopId(order.getShopId());
+        shopTotalChangeDto.setTypeCycleService(1);
+        shopTotalChangeDto.setCycleService(cycleService);
+        shopTotalChangeDto.setCyclePerson(cyclePerson);
+        shopTotalChangeDto.setTypeServiceService(1);
+        shopTotalChangeDto.setServiceService(serviceService);
+        shopTotalChangeDto.setServicePerson(servicePerson);
+        shopTotalChangeDto.setTypeExperienceService(1);
+        shopTotalChangeDto.setExperienceService(experienceService);
+        shopTotalChangeDto.setExperiencePerson(experiencePerson);
+        remoteShopService.changeShopTotal(shopTotalChangeDto);
         return merVerifyOrderVo;
     }
 
     /**
-     * @description  确认核销优惠券
-     * @author  jqs
-     * @date    2023/6/28 11:26
      * @param merVerifyCouponDto
-     * @return  MerVerifyCouponVo
+     * @return MerVerifyCouponVo
+     * @description 确认核销优惠券
+     * @author jqs
+     * @date 2023/6/28 11:26
      */
     @Override
-    public MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto){
+    public MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto) {
         MerVerifyCouponGetVo verifyCouponGetVo = remoteCouponService.getVerifyCoupon(merVerifyCouponDto.getMemberCouponId()).getData();
         // 创建MerVerifyCouponVo对象
         MerVerifyCouponVo merVerifyCouponVo = new MerVerifyCouponVo();
@@ -809,6 +868,10 @@
         String orderNo = CodeFactoryUtil.getShopOrderNo();
         OrderGoods orderGoods;
         String orderGoodsId;
+        BigDecimal cycleMoney = new BigDecimal("0.00");
+        BigDecimal experienceMoney = new BigDecimal("0.00");
+        BigDecimal serviceMoney = new BigDecimal("0.00");
+        BigDecimal goodsMoney = new BigDecimal("0.00");
         for (AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList) {
             goodsId = appBuyGoodsDto.getGoodsId();
             memberCouponId = appBuyGoodsDto.getMemberCouponId();
@@ -877,6 +940,22 @@
             orderGoods.setServiceNum(serviceNum);
             orderGoods.setGoodsType(goods.getGoodsType());
             orderGoodsService.save(orderGoods);
+            switch(orderGoods.getGoodsType()){
+                case 1:
+                    cycleMoney = cycleMoney.add(orderGoods.getGoodsReceivableMoney());
+                    break;
+                case 2:
+                    serviceMoney = serviceMoney.add(orderGoods.getGoodsReceivableMoney());
+                    break;
+                case 3:
+                    experienceMoney = experienceMoney.add(orderGoods.getGoodsReceivableMoney());
+                    break;
+                case 4:
+                    goodsMoney = goodsMoney.add(orderGoods.getGoodsReceivableMoney());
+                    break;
+                default:
+                    break;
+            }
         }
         //创建订单
         Order order = new Order();
@@ -951,6 +1030,13 @@
             appMemberBindingDto.setBindingFlag(1);
             remoteMemberService.updateMemberBinding(appMemberBindingDto);
         }
+        ShopTotalChangeDto shopTotalChangeDto = new ShopTotalChangeDto();
+        shopTotalChangeDto.setShopId(order.getShopId());
+        shopTotalChangeDto.setCycleMoney(cycleMoney);
+        shopTotalChangeDto.setServiceMoney(serviceMoney);
+        shopTotalChangeDto.setExperienceMoney(experienceMoney);
+        shopTotalChangeDto.setGoodsMoney(goodsMoney);
+        remoteShopService.changeShopTotal(shopTotalChangeDto);
     }
 
 
@@ -1374,53 +1460,53 @@
     public MgtTotalOrderTotalVo getTotalOrderTotal(MgtBaseShopDto mgtBaseShopDto) {
         MgtTotalOrderTotalVo mgtTotalOrderTotalVo = orderMapper.getTotalOrderTotalOrderFrom(mgtBaseShopDto);
         //MgtTotalOrderTotalVo mgtTotalOrderTotalVoGoodsType = orderMapper.getTotalOrderTotalGoodsType(mgtBaseShopDto);
-        List<MgtMapTotalPlusVo> mgtMapTotalVos = orderMapper.listTotalOrderTotal(mgtBaseShopDto);
-        if (mgtMapTotalVos != null && mgtMapTotalVos.size() > 0) {
-            String[] orderTotalKey = new String[mgtMapTotalVos.size()];
-            Integer[] orderTotalValue = new Integer[mgtMapTotalVos.size()];
-            BigDecimal[] orderMoneyValue = new BigDecimal[mgtMapTotalVos.size()];
-            for (int i = 0; i < mgtMapTotalVos.size(); i++) {
-                orderTotalKey[i] = mgtMapTotalVos.get(i).getMapKey();
-                orderTotalValue[i] = mgtMapTotalVos.get(i).getMapValueFirst();
-                orderMoneyValue[i] = mgtMapTotalVos.get(i).getMapValueSecond();
+        List<MgtMapTotalPlusVo> MgtMapIntTotalVos = orderMapper.listTotalOrderTotal(mgtBaseShopDto);
+        if (MgtMapIntTotalVos != null && MgtMapIntTotalVos.size() > 0) {
+            String[] orderTotalKey = new String[MgtMapIntTotalVos.size()];
+            Integer[] orderTotalValue = new Integer[MgtMapIntTotalVos.size()];
+            BigDecimal[] orderMoneyValue = new BigDecimal[MgtMapIntTotalVos.size()];
+            for (int i = 0; i < MgtMapIntTotalVos.size(); i++) {
+                orderTotalKey[i] = MgtMapIntTotalVos.get(i).getMapKey();
+                orderTotalValue[i] = MgtMapIntTotalVos.get(i).getMapValueFirst();
+                orderMoneyValue[i] = MgtMapIntTotalVos.get(i).getMapValueSecond();
             }
             mgtTotalOrderTotalVo.setOrderTotalKey(orderTotalKey);
             mgtTotalOrderTotalVo.setOrderTotalValue(orderTotalValue);
             mgtTotalOrderTotalVo.setOrderMoneyValue(orderMoneyValue);
         }
         //获取商品分类销售数据
-        List<MgtMapTotalPlusVo> mgtMapTotalVoGoodsType = orderMapper.listTotalOrderTotalGoodsType(mgtBaseShopDto);
-        List<MgtMapTotalVo> goodsTypeTotalList = new ArrayList<>();
+        List<MgtMapTotalPlusVo> MgtMapIntTotalVoGoodsType = orderMapper.listTotalOrderTotalGoodsType(mgtBaseShopDto);
+        List<MgtMapIntTotalVo> goodsTypeTotalList = new ArrayList<>();
         List<MgtMapBigTotalVo> goodsTypeMoneyList = new ArrayList<>();
-        if (mgtMapTotalVoGoodsType != null && mgtMapTotalVoGoodsType.size() > 0) {
-            MgtMapTotalVo mgtMapTotalVo;
+        if (MgtMapIntTotalVoGoodsType != null && MgtMapIntTotalVoGoodsType.size() > 0) {
+            MgtMapIntTotalVo MgtMapIntTotalVo;
             MgtMapBigTotalVo mgtMapBigTotalVo;
             // 遍历不同商品类型的会员数列表,设置商品类型数组和对应的会员数数组
-            for (int i = 0; i < mgtMapTotalVoGoodsType.size(); i++) {
-                mgtMapTotalVo = new MgtMapTotalVo();
+            for (int i = 0; i < MgtMapIntTotalVoGoodsType.size(); i++) {
+                MgtMapIntTotalVo = new MgtMapIntTotalVo();
                 mgtMapBigTotalVo = new MgtMapBigTotalVo();
-                mgtMapTotalVo.setMapValue(mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                mgtMapBigTotalVo.setMapValue(mgtMapTotalVoGoodsType.get(i).getMapValueSecond());
-                if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("1")) {
-                    mgtMapTotalVo.setMapKey("周期");
+                MgtMapIntTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                mgtMapBigTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond());
+                if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("1")) {
+                    MgtMapIntTotalVo.setMapKey("周期");
                     mgtMapBigTotalVo.setMapKey("周期");
-                    mgtTotalOrderTotalVo.setCycleTotal(mgtTotalOrderTotalVo.getCycleTotal() + mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                    mgtTotalOrderTotalVo.setCycleMoney(mgtTotalOrderTotalVo.getCycleMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
-                } else if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("2")) {
-                    mgtMapTotalVo.setMapKey("服务");
+                    mgtTotalOrderTotalVo.setCycleTotal(mgtTotalOrderTotalVo.getCycleTotal() + MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                    mgtTotalOrderTotalVo.setCycleMoney(mgtTotalOrderTotalVo.getCycleMoney().add(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond()));
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("2")) {
+                    MgtMapIntTotalVo.setMapKey("服务");
                     mgtMapBigTotalVo.setMapKey("服务");
-                    mgtTotalOrderTotalVo.setServiceTotal(mgtTotalOrderTotalVo.getServiceTotal() + mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                    mgtTotalOrderTotalVo.setServiceMoney(mgtTotalOrderTotalVo.getServiceMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
-                } else if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("3")) {
-                    mgtMapTotalVo.setMapKey("体验");
+                    mgtTotalOrderTotalVo.setServiceTotal(mgtTotalOrderTotalVo.getServiceTotal() + MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                    mgtTotalOrderTotalVo.setServiceMoney(mgtTotalOrderTotalVo.getServiceMoney().add(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond()));
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("3")) {
+                    MgtMapIntTotalVo.setMapKey("体验");
                     mgtMapBigTotalVo.setMapKey("体验");
-                    mgtTotalOrderTotalVo.setExperienceTotal(mgtTotalOrderTotalVo.getExperienceTotal() + mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                    mgtTotalOrderTotalVo.setExperienceMoney(mgtTotalOrderTotalVo.getExperienceMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
-                } else if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("4")) {
-                    mgtMapTotalVo.setMapKey("单品");
+                    mgtTotalOrderTotalVo.setExperienceTotal(mgtTotalOrderTotalVo.getExperienceTotal() + MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                    mgtTotalOrderTotalVo.setExperienceMoney(mgtTotalOrderTotalVo.getExperienceMoney().add(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond()));
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("4")) {
+                    MgtMapIntTotalVo.setMapKey("单品");
                     mgtMapBigTotalVo.setMapKey("单品");
                 }
-                goodsTypeTotalList.add(mgtMapTotalVo);
+                goodsTypeTotalList.add(MgtMapIntTotalVo);
                 goodsTypeMoneyList.add(mgtMapBigTotalVo);
             }
             mgtTotalOrderTotalVo.setGoodsTypeTotalList(goodsTypeTotalList);
@@ -1442,35 +1528,35 @@
     }
 
     /**
-     * @param mgtMapTotalVos
-     * @return List<MgtMapTotalVo>
+     * @param MgtMapIntTotalVos
+     * @return List<MgtMapIntTotalVo>
      * @description 去除空字符串
      * @author jqs
      * @date 2023/6/27 17:35
      */
-    private List<MgtMapTotalVo> listRemoveNull(List<MgtMapTotalVo> mgtMapTotalVos) {
-        for (int i = 0; i < mgtMapTotalVos.size(); i++) {
-            if (StringUtils.isBlank(mgtMapTotalVos.get(i).getMapKey())) {
-                mgtMapTotalVos.remove(i);
+    private List<MgtMapIntTotalVo> listRemoveNull(List<MgtMapIntTotalVo> MgtMapIntTotalVos) {
+        for (int i = 0; i < MgtMapIntTotalVos.size(); i++) {
+            if (StringUtils.isBlank(MgtMapIntTotalVos.get(i).getMapKey())) {
+                MgtMapIntTotalVos.remove(i);
             }
         }
-        return mgtMapTotalVos;
+        return MgtMapIntTotalVos;
     }
 
     /**
-     * @param mgtMapTotalVos
-     * @return List<MgtMapTotalVo>
+     * @param MgtMapIntTotalVos
+     * @return List<MgtMapIntTotalVo>
      * @description 去除空字符串
      * @author jqs
      * @date 2023/6/27 17:35
      */
-    private List<MgtMapBigTotalVo> bigListRemoveNull(List<MgtMapBigTotalVo> mgtMapTotalVos) {
-        for (int i = 0; i < mgtMapTotalVos.size(); i++) {
-            if (StringUtils.isBlank(mgtMapTotalVos.get(i).getMapKey())) {
-                mgtMapTotalVos.remove(i);
+    private List<MgtMapBigTotalVo> bigListRemoveNull(List<MgtMapBigTotalVo> MgtMapIntTotalVos) {
+        for (int i = 0; i < MgtMapIntTotalVos.size(); i++) {
+            if (StringUtils.isBlank(MgtMapIntTotalVos.get(i).getMapKey())) {
+                MgtMapIntTotalVos.remove(i);
             }
         }
-        return mgtMapTotalVos;
+        return MgtMapIntTotalVos;
     }
 
     /**
@@ -1485,9 +1571,9 @@
         //获取基础统计
         MgtTotalActivityTotalVo totalActivityTotalVo = orderMapper.getTotalActivityTotal(mgtBaseShopDto);
         //获取商品分类销售数据
-        List<MgtMapTotalPlusVo> mgtMapTotalVoGoodsType = orderMapper.listTotalActivityTotalGoodsType(mgtBaseShopDto);
-        if (mgtMapTotalVoGoodsType != null && mgtMapTotalVoGoodsType.size() > 0) {
-            List<MgtMapTotalVo> goodsTypeTotalList = new ArrayList<>();
+        List<MgtMapTotalPlusVo> MgtMapIntTotalVoGoodsType = orderMapper.listTotalActivityTotalGoodsType(mgtBaseShopDto);
+        if (MgtMapIntTotalVoGoodsType != null && MgtMapIntTotalVoGoodsType.size() > 0) {
+            List<MgtMapIntTotalVo> goodsTypeTotalList = new ArrayList<>();
             List<MgtMapBigTotalVo> goodsTypeMoneyList = new ArrayList<>();
             totalActivityTotalVo.setCycleTotal(0);
             totalActivityTotalVo.setCycleMoney(BigDecimal.ZERO);
@@ -1496,49 +1582,49 @@
             totalActivityTotalVo.setExperienceTotal(0);
             totalActivityTotalVo.setExperienceMoney(BigDecimal.ZERO);
             // 遍历不同商品类型的会员数列表,设置商品类型数组和对应的会员数数组
-            MgtMapTotalVo mgtMapTotalVo;
+            MgtMapIntTotalVo MgtMapIntTotalVo;
             MgtMapBigTotalVo mgtMapBigTotalVo;
             // 遍历不同商品类型的会员数列表,设置商品类型数组和对应的会员数数组
-            for (int i = 0; i < mgtMapTotalVoGoodsType.size(); i++) {
-                mgtMapTotalVo = new MgtMapTotalVo();
+            for (int i = 0; i < MgtMapIntTotalVoGoodsType.size(); i++) {
+                MgtMapIntTotalVo = new MgtMapIntTotalVo();
                 mgtMapBigTotalVo = new MgtMapBigTotalVo();
-                mgtMapTotalVo.setMapValue(mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                mgtMapBigTotalVo.setMapValue(mgtMapTotalVoGoodsType.get(i).getMapValueSecond());
-                if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("1")) {
-                    mgtMapTotalVo.setMapKey("周期");
+                MgtMapIntTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                mgtMapBigTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond());
+                if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("1")) {
+                    MgtMapIntTotalVo.setMapKey("周期");
                     mgtMapBigTotalVo.setMapKey("周期");
-                    totalActivityTotalVo.setCycleTotal(totalActivityTotalVo.getCycleTotal() + mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                    totalActivityTotalVo.setCycleMoney(totalActivityTotalVo.getCycleMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
-                } else if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("2")) {
-                    mgtMapTotalVo.setMapKey("服务");
+                    totalActivityTotalVo.setCycleTotal(totalActivityTotalVo.getCycleTotal() + MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                    totalActivityTotalVo.setCycleMoney(totalActivityTotalVo.getCycleMoney().add(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond()));
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("2")) {
+                    MgtMapIntTotalVo.setMapKey("服务");
                     mgtMapBigTotalVo.setMapKey("服务");
-                    totalActivityTotalVo.setServiceTotal(totalActivityTotalVo.getServiceTotal() + mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                    totalActivityTotalVo.setServiceMoney(totalActivityTotalVo.getServiceMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
-                } else if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("3")) {
-                    mgtMapTotalVo.setMapKey("体验");
+                    totalActivityTotalVo.setServiceTotal(totalActivityTotalVo.getServiceTotal() + MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                    totalActivityTotalVo.setServiceMoney(totalActivityTotalVo.getServiceMoney().add(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond()));
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("3")) {
+                    MgtMapIntTotalVo.setMapKey("体验");
                     mgtMapBigTotalVo.setMapKey("体验");
-                    totalActivityTotalVo.setExperienceTotal(totalActivityTotalVo.getExperienceTotal() + mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                    totalActivityTotalVo.setExperienceMoney(totalActivityTotalVo.getExperienceMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
-                } else if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("4")) {
-                    mgtMapTotalVo.setMapKey("单品");
+                    totalActivityTotalVo.setExperienceTotal(totalActivityTotalVo.getExperienceTotal() + MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                    totalActivityTotalVo.setExperienceMoney(totalActivityTotalVo.getExperienceMoney().add(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond()));
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("4")) {
+                    MgtMapIntTotalVo.setMapKey("单品");
                     mgtMapBigTotalVo.setMapKey("单品");
                 }
-                goodsTypeTotalList.add(mgtMapTotalVo);
+                goodsTypeTotalList.add(MgtMapIntTotalVo);
                 goodsTypeMoneyList.add(mgtMapBigTotalVo);
             }
             totalActivityTotalVo.setGoodsTypeTotalList(goodsTypeTotalList);
             totalActivityTotalVo.setGoodsTypeMoneyList(goodsTypeMoneyList);
         }
         //获取订单分布
-        List<MgtMapTotalPlusVo> mgtMapTotalVos = orderMapper.listTotalActivityTotal(mgtBaseShopDto);
-        if (mgtMapTotalVos != null && mgtMapTotalVos.size() > 0) {
-            String[] orderTotalKey = new String[mgtMapTotalVos.size()];
-            Integer[] orderTotalValue = new Integer[mgtMapTotalVos.size()];
-            BigDecimal[] orderMoneyValue = new BigDecimal[mgtMapTotalVos.size()];
-            for (int i = 0; i < mgtMapTotalVos.size(); i++) {
-                orderTotalKey[i] = mgtMapTotalVos.get(i).getMapKey();
-                orderTotalValue[i] = mgtMapTotalVos.get(i).getMapValueFirst();
-                orderMoneyValue[i] = mgtMapTotalVos.get(i).getMapValueSecond();
+        List<MgtMapTotalPlusVo> MgtMapIntTotalVos = orderMapper.listTotalActivityTotal(mgtBaseShopDto);
+        if (MgtMapIntTotalVos != null && MgtMapIntTotalVos.size() > 0) {
+            String[] orderTotalKey = new String[MgtMapIntTotalVos.size()];
+            Integer[] orderTotalValue = new Integer[MgtMapIntTotalVos.size()];
+            BigDecimal[] orderMoneyValue = new BigDecimal[MgtMapIntTotalVos.size()];
+            for (int i = 0; i < MgtMapIntTotalVos.size(); i++) {
+                orderTotalKey[i] = MgtMapIntTotalVos.get(i).getMapKey();
+                orderTotalValue[i] = MgtMapIntTotalVos.get(i).getMapValueFirst();
+                orderMoneyValue[i] = MgtMapIntTotalVos.get(i).getMapValueSecond();
             }
             totalActivityTotalVo.setOrderTotalKey(orderTotalKey);
             totalActivityTotalVo.setOrderTotalValue(orderTotalValue);
@@ -1560,17 +1646,17 @@
         mgtActivityAgeDto.setUserIds(userIds);
         userIds = remoteMemberService.listUserIdByAge(mgtActivityAgeDto).getData();
         mgtActivityAgeDto.setUserIds(userIds);
-        List<MgtMapTotalVo> ageRankList = orderMapper.getTotalActivityAgeRank(mgtActivityAgeDto);
+        List<MgtMapIntTotalVo> ageRankList = orderMapper.getTotalActivityAgeRank(mgtActivityAgeDto);
         ageRankList = listRemoveNull(ageRankList);
         MgtTotalActivityTotalVo totalActivityTotalVo = new MgtTotalActivityTotalVo();
         String[] activityAgeKey = new String[ageRankList.size()];
         Integer[] activityAgeValue = new Integer[ageRankList.size()];
         if (!ageRankList.isEmpty()) {
-            MgtMapTotalVo mgtMapTotalVo;
+            MgtMapIntTotalVo MgtMapIntTotalVo;
             for (int i = 0; i < ageRankList.size(); i++) {
-                mgtMapTotalVo = ageRankList.get(i);
-                activityAgeKey[i] = mgtMapTotalVo.getMapKey();
-                activityAgeValue[i] = mgtMapTotalVo.getMapValue();
+                MgtMapIntTotalVo = ageRankList.get(i);
+                activityAgeKey[i] = MgtMapIntTotalVo.getMapKey();
+                activityAgeValue[i] = MgtMapIntTotalVo.getMapValue();
             }
         }
         totalActivityTotalVo.setActivityAgeKey(activityAgeKey);
@@ -1600,13 +1686,13 @@
 
     /**
      * @param mgtBasePlatformDto
-     * @return List<MgtMapTotalVo>
+     * @return List<MgtMapIntTotalVo>
      * @description
      * @author jqs
      * @date 2023/6/21 15:26
      */
     @Override
-    public List<MgtMapTotalVo> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto) {
+    public List<MgtMapIntTotalVo> listMemberGoodsRank(MgtBasePlatformDto mgtBasePlatformDto) {
         return orderMapper.listMemberGoodsRank(mgtBasePlatformDto);
     }
 
@@ -1681,23 +1767,23 @@
         mgtBasePlatformDto.setShopIdList(shopIdList);
         //获取基础统计
         MgtTotalOrderTotalVo mgtTotalOrderTotalVo = orderMapper.getPlTotalOrderTotalOrderFrom(mgtBasePlatformDto);
-        List<MgtMapTotalPlusVo> mgtMapTotalVos = orderMapper.listPlTotalOrderTotal(mgtBasePlatformDto);
-        if (mgtMapTotalVos != null && mgtMapTotalVos.size() > 0) {
-            String[] orderTotalKey = new String[mgtMapTotalVos.size()];
-            Integer[] orderTotalValue = new Integer[mgtMapTotalVos.size()];
-            BigDecimal[] orderMoneyValue = new BigDecimal[mgtMapTotalVos.size()];
-            for (int i = 0; i < mgtMapTotalVos.size(); i++) {
-                orderTotalKey[i] = mgtMapTotalVos.get(i).getMapKey();
-                orderTotalValue[i] = mgtMapTotalVos.get(i).getMapValueFirst();
-                orderMoneyValue[i] = mgtMapTotalVos.get(i).getMapValueSecond();
+        List<MgtMapTotalPlusVo> MgtMapIntTotalVos = orderMapper.listPlTotalOrderTotal(mgtBasePlatformDto);
+        if (MgtMapIntTotalVos != null && MgtMapIntTotalVos.size() > 0) {
+            String[] orderTotalKey = new String[MgtMapIntTotalVos.size()];
+            Integer[] orderTotalValue = new Integer[MgtMapIntTotalVos.size()];
+            BigDecimal[] orderMoneyValue = new BigDecimal[MgtMapIntTotalVos.size()];
+            for (int i = 0; i < MgtMapIntTotalVos.size(); i++) {
+                orderTotalKey[i] = MgtMapIntTotalVos.get(i).getMapKey();
+                orderTotalValue[i] = MgtMapIntTotalVos.get(i).getMapValueFirst();
+                orderMoneyValue[i] = MgtMapIntTotalVos.get(i).getMapValueSecond();
             }
             mgtTotalOrderTotalVo.setOrderTotalKey(orderTotalKey);
             mgtTotalOrderTotalVo.setOrderTotalValue(orderTotalValue);
             mgtTotalOrderTotalVo.setOrderMoneyValue(orderMoneyValue);
         }
         //获取商品分类销售数据
-        List<MgtMapTotalPlusVo> mgtMapTotalVoGoodsType = orderMapper.listPlTotalOrderTotalGoodsType(mgtBasePlatformDto);
-        List<MgtMapTotalVo> goodsTypeTotalList = new ArrayList<>();
+        List<MgtMapTotalPlusVo> MgtMapIntTotalVoGoodsType = orderMapper.listPlTotalOrderTotalGoodsType(mgtBasePlatformDto);
+        List<MgtMapIntTotalVo> goodsTypeTotalList = new ArrayList<>();
         List<MgtMapBigTotalVo> goodsTypeMoneyList = new ArrayList<>();
         mgtTotalOrderTotalVo.setCycleTotal(0);
         mgtTotalOrderTotalVo.setCycleMoney(BigDecimal.ZERO);
@@ -1705,35 +1791,35 @@
         mgtTotalOrderTotalVo.setServiceMoney(BigDecimal.ZERO);
         mgtTotalOrderTotalVo.setExperienceTotal(0);
         mgtTotalOrderTotalVo.setExperienceMoney(BigDecimal.ZERO);
-        if (mgtMapTotalVoGoodsType != null && mgtMapTotalVoGoodsType.size() > 0) {
-            MgtMapTotalVo mgtMapTotalVo;
+        if (MgtMapIntTotalVoGoodsType != null && MgtMapIntTotalVoGoodsType.size() > 0) {
+            MgtMapIntTotalVo MgtMapIntTotalVo;
             MgtMapBigTotalVo mgtMapBigTotalVo;
             // 遍历不同商品类型的会员数列表,设置商品类型数组和对应的会员数数组
-            for (int i = 0; i < mgtMapTotalVoGoodsType.size(); i++) {
-                mgtMapTotalVo = new MgtMapTotalVo();
+            for (int i = 0; i < MgtMapIntTotalVoGoodsType.size(); i++) {
+                MgtMapIntTotalVo = new MgtMapIntTotalVo();
                 mgtMapBigTotalVo = new MgtMapBigTotalVo();
-                mgtMapTotalVo.setMapValue(mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                mgtMapBigTotalVo.setMapValue(mgtMapTotalVoGoodsType.get(i).getMapValueSecond());
-                if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("1")) {
-                    mgtMapTotalVo.setMapKey("周期");
+                MgtMapIntTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                mgtMapBigTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond());
+                if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("1")) {
+                    MgtMapIntTotalVo.setMapKey("周期");
                     mgtMapBigTotalVo.setMapKey("周期");
-                    mgtTotalOrderTotalVo.setCycleTotal(mgtTotalOrderTotalVo.getCycleTotal() + mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                    mgtTotalOrderTotalVo.setCycleMoney(mgtTotalOrderTotalVo.getCycleMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
-                } else if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("2")) {
-                    mgtMapTotalVo.setMapKey("服务");
+                    mgtTotalOrderTotalVo.setCycleTotal(mgtTotalOrderTotalVo.getCycleTotal() + MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                    mgtTotalOrderTotalVo.setCycleMoney(mgtTotalOrderTotalVo.getCycleMoney().add(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond()));
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("2")) {
+                    MgtMapIntTotalVo.setMapKey("服务");
                     mgtMapBigTotalVo.setMapKey("服务");
-                    mgtTotalOrderTotalVo.setServiceTotal(mgtTotalOrderTotalVo.getServiceTotal() + mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                    mgtTotalOrderTotalVo.setServiceMoney(mgtTotalOrderTotalVo.getServiceMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
-                } else if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("3")) {
-                    mgtMapTotalVo.setMapKey("体验");
+                    mgtTotalOrderTotalVo.setServiceTotal(mgtTotalOrderTotalVo.getServiceTotal() + MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                    mgtTotalOrderTotalVo.setServiceMoney(mgtTotalOrderTotalVo.getServiceMoney().add(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond()));
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("3")) {
+                    MgtMapIntTotalVo.setMapKey("体验");
                     mgtMapBigTotalVo.setMapKey("体验");
-                    mgtTotalOrderTotalVo.setExperienceTotal(mgtTotalOrderTotalVo.getExperienceTotal() + mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                    mgtTotalOrderTotalVo.setExperienceMoney(mgtTotalOrderTotalVo.getExperienceMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
-                } else if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("4")) {
-                    mgtMapTotalVo.setMapKey("单品");
+                    mgtTotalOrderTotalVo.setExperienceTotal(mgtTotalOrderTotalVo.getExperienceTotal() + MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                    mgtTotalOrderTotalVo.setExperienceMoney(mgtTotalOrderTotalVo.getExperienceMoney().add(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond()));
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("4")) {
+                    MgtMapIntTotalVo.setMapKey("单品");
                     mgtMapBigTotalVo.setMapKey("单品");
                 }
-                goodsTypeTotalList.add(mgtMapTotalVo);
+                goodsTypeTotalList.add(MgtMapIntTotalVo);
                 goodsTypeMoneyList.add(mgtMapBigTotalVo);
             }
             mgtTotalOrderTotalVo.setGoodsTypeTotalList(goodsTypeTotalList);
@@ -1783,8 +1869,8 @@
         //获取基础统计
         MgtPlTotalActivityTotalVo totalActivityTotalVo = orderMapper.getPlTotalActivityTotal(mgtBasePlatformDto);
         //获取商品分类销售数据
-        List<MgtMapTotalPlusVo> mgtMapTotalVoGoodsType = orderMapper.listPlTotalActivityTotalGoodsType(mgtBasePlatformDto);
-        List<MgtMapTotalVo> goodsTypeTotalList = new ArrayList<>();
+        List<MgtMapTotalPlusVo> MgtMapIntTotalVoGoodsType = orderMapper.listPlTotalActivityTotalGoodsType(mgtBasePlatformDto);
+        List<MgtMapIntTotalVo> goodsTypeTotalList = new ArrayList<>();
         List<MgtMapBigTotalVo> goodsTypeMoneyList = new ArrayList<>();
         totalActivityTotalVo.setCycleTotal(0);
         totalActivityTotalVo.setCycleMoney(BigDecimal.ZERO);
@@ -1792,32 +1878,32 @@
         totalActivityTotalVo.setServiceMoney(BigDecimal.ZERO);
         totalActivityTotalVo.setExperienceTotal(0);
         totalActivityTotalVo.setExperienceMoney(BigDecimal.ZERO);
-        if (mgtMapTotalVoGoodsType != null && mgtMapTotalVoGoodsType.size() > 0) {
-            MgtMapTotalVo mgtMapTotalVo;
+        if (MgtMapIntTotalVoGoodsType != null && MgtMapIntTotalVoGoodsType.size() > 0) {
+            MgtMapIntTotalVo MgtMapIntTotalVo;
             MgtMapBigTotalVo mgtMapBigTotalVo;
             // 遍历不同商品类型的会员数列表,设置商品类型数组和对应的会员数数组
-            for (int i = 0; i < mgtMapTotalVoGoodsType.size(); i++) {
-                mgtMapTotalVo = new MgtMapTotalVo();
+            for (int i = 0; i < MgtMapIntTotalVoGoodsType.size(); i++) {
+                MgtMapIntTotalVo = new MgtMapIntTotalVo();
                 mgtMapBigTotalVo = new MgtMapBigTotalVo();
-                mgtMapTotalVo.setMapValue(mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                mgtMapBigTotalVo.setMapValue(mgtMapTotalVoGoodsType.get(i).getMapValueSecond());
-                if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("1")) {
-                    mgtMapTotalVo.setMapKey("周期");
+                MgtMapIntTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                mgtMapBigTotalVo.setMapValue(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond());
+                if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("1")) {
+                    MgtMapIntTotalVo.setMapKey("周期");
                     mgtMapBigTotalVo.setMapKey("周期");
-                    totalActivityTotalVo.setCycleTotal(totalActivityTotalVo.getCycleTotal() + mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                    totalActivityTotalVo.setCycleMoney(totalActivityTotalVo.getCycleMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
-                } else if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("2")) {
-                    mgtMapTotalVo.setMapKey("服务");
+                    totalActivityTotalVo.setCycleTotal(totalActivityTotalVo.getCycleTotal() + MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                    totalActivityTotalVo.setCycleMoney(totalActivityTotalVo.getCycleMoney().add(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond()));
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("2")) {
+                    MgtMapIntTotalVo.setMapKey("服务");
                     mgtMapBigTotalVo.setMapKey("服务");
-                    totalActivityTotalVo.setServiceTotal(totalActivityTotalVo.getServiceTotal() + mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                    totalActivityTotalVo.setServiceMoney(totalActivityTotalVo.getServiceMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
-                } else if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("3")) {
-                    mgtMapTotalVo.setMapKey("体验");
+                    totalActivityTotalVo.setServiceTotal(totalActivityTotalVo.getServiceTotal() + MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                    totalActivityTotalVo.setServiceMoney(totalActivityTotalVo.getServiceMoney().add(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond()));
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("3")) {
+                    MgtMapIntTotalVo.setMapKey("体验");
                     mgtMapBigTotalVo.setMapKey("体验");
-                    totalActivityTotalVo.setExperienceTotal(totalActivityTotalVo.getExperienceTotal() + mgtMapTotalVoGoodsType.get(i).getMapValueFirst());
-                    totalActivityTotalVo.setExperienceMoney(totalActivityTotalVo.getExperienceMoney().add(mgtMapTotalVoGoodsType.get(i).getMapValueSecond()));
-                } else if (mgtMapTotalVoGoodsType.get(i).getMapKey().equals("4")) {
-                    mgtMapTotalVo.setMapKey("单品");
+                    totalActivityTotalVo.setExperienceTotal(totalActivityTotalVo.getExperienceTotal() + MgtMapIntTotalVoGoodsType.get(i).getMapValueFirst());
+                    totalActivityTotalVo.setExperienceMoney(totalActivityTotalVo.getExperienceMoney().add(MgtMapIntTotalVoGoodsType.get(i).getMapValueSecond()));
+                } else if (MgtMapIntTotalVoGoodsType.get(i).getMapKey().equals("4")) {
+                    MgtMapIntTotalVo.setMapKey("单品");
                     mgtMapBigTotalVo.setMapKey("单品");
                 }
             }
@@ -1825,15 +1911,15 @@
             totalActivityTotalVo.setGoodsTypeMoneyList(goodsTypeMoneyList);
         }
         //获取订单分布
-        List<MgtMapTotalPlusVo> mgtMapTotalVos = orderMapper.listPlTotalActivityTotal(mgtBasePlatformDto);
-        if (mgtMapTotalVos != null && mgtMapTotalVos.size() > 0) {
-            String[] orderTotalKey = new String[mgtMapTotalVos.size()];
-            Integer[] orderTotalValue = new Integer[mgtMapTotalVos.size()];
-            BigDecimal[] orderMoneyValue = new BigDecimal[mgtMapTotalVos.size()];
-            for (int i = 0; i < mgtMapTotalVos.size(); i++) {
-                orderTotalKey[i] = mgtMapTotalVos.get(i).getMapKey();
-                orderTotalValue[i] = mgtMapTotalVos.get(i).getMapValueFirst();
-                orderMoneyValue[i] = mgtMapTotalVos.get(i).getMapValueSecond();
+        List<MgtMapTotalPlusVo> MgtMapIntTotalVos = orderMapper.listPlTotalActivityTotal(mgtBasePlatformDto);
+        if (MgtMapIntTotalVos != null && MgtMapIntTotalVos.size() > 0) {
+            String[] orderTotalKey = new String[MgtMapIntTotalVos.size()];
+            Integer[] orderTotalValue = new Integer[MgtMapIntTotalVos.size()];
+            BigDecimal[] orderMoneyValue = new BigDecimal[MgtMapIntTotalVos.size()];
+            for (int i = 0; i < MgtMapIntTotalVos.size(); i++) {
+                orderTotalKey[i] = MgtMapIntTotalVos.get(i).getMapKey();
+                orderTotalValue[i] = MgtMapIntTotalVos.get(i).getMapValueFirst();
+                orderMoneyValue[i] = MgtMapIntTotalVos.get(i).getMapValueSecond();
             }
             totalActivityTotalVo.setOrderTotalKey(orderTotalKey);
             totalActivityTotalVo.setOrderTotalValue(orderTotalValue);
@@ -1889,17 +1975,17 @@
         mgtActivityAgeDto.setAgeType(mgtPlActivityAgeDto.getAgeType());
         userIds = remoteMemberService.listUserIdByAge(mgtActivityAgeDto).getData();
         mgtPlActivityAgeDto.setUserIds(userIds);
-        List<MgtMapTotalVo> ageRankList = orderMapper.getPlTotalActivityAgeRank(mgtPlActivityAgeDto);
+        List<MgtMapIntTotalVo> ageRankList = orderMapper.getPlTotalActivityAgeRank(mgtPlActivityAgeDto);
         ageRankList = listRemoveNull(ageRankList);
         MgtPlTotalActivityTotalVo plTotalActivityTotalVo = new MgtPlTotalActivityTotalVo();
         String[] activityAgeKey = new String[ageRankList.size()];
         Integer[] activityAgeValue = new Integer[ageRankList.size()];
         if (!ageRankList.isEmpty()) {
-            MgtMapTotalVo mgtMapTotalVo;
+            MgtMapIntTotalVo MgtMapIntTotalVo;
             for (int i = 0; i < ageRankList.size(); i++) {
-                mgtMapTotalVo = ageRankList.get(i);
-                activityAgeKey[i] = mgtMapTotalVo.getMapKey();
-                activityAgeValue[i] = mgtMapTotalVo.getMapValue();
+                MgtMapIntTotalVo = ageRankList.get(i);
+                activityAgeKey[i] = MgtMapIntTotalVo.getMapKey();
+                activityAgeValue[i] = MgtMapIntTotalVo.getMapValue();
             }
         }
         plTotalActivityTotalVo.setActivityAgeKey(activityAgeKey);
@@ -1941,4 +2027,17 @@
         merVerifyCouponVo.setGoodsList(merCouponGoodsList);
         return merVerifyCouponVo;
     }
+
+    /**
+     * @description  获取用户未支付金额
+     * @author  jqs
+     * @date    2023/6/29 18:00
+     * @param merBaseDto
+     * @return  BigDecimal
+     */
+    @Override
+    public BigDecimal getMemberUnpaidOrder(MerBaseDto merBaseDto){
+        BigDecimal unpaidMoney = orderMapper.getMemberUnpaidOrder(merBaseDto);
+        return unpaidMoney;
+    }
 }

--
Gitblit v1.7.1