bug

fuintAdmin/src/views/member/index.vue

@@ -92,7 +92,7 @@
           </div>
           <div class="k-three">
             <div class="title_">充值总人数</div>
-            <div class="num-size">{{balance}}</div>
+            <div class="num-size">{{rechargeTotal || 0}}</div>
             <img class="r-bot-img" src="./imgs/hy-3.png" alt="">
           </div>
           <div class="k-four">
@@ -477,6 +477,7 @@ export default {
       addNum:'',
       // 昨日新增
       yesterdayAddNum:'',
+      rechargeTotal:"",
       // 遮罩层
       loading: true,
       uploading: false,
@@ -612,6 +613,7 @@ export default {
       listStatistic(this.addDateRange(this.queryParams, dateRange)).then( response => {
         this.addNum = response.data.addNum;
         this.yesterdayAddNum = response.data.yesterdayAddNum;
+        this.rechargeTotal = response.data.rechargeTotal;
         if (!response.data.balance) {
           this.balance = 0
         }else {

fuintAdmin/src/views/order/order_Added.vue

@@ -91,7 +91,7 @@
     <!--    统计-->
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span>统计</span>
+        <span>挂账订单统计</span>
       </div>
       <div class="box-gang">
         <div class="box">

fuintAdmin/src/views/order/order_Cashier.vue

@@ -51,7 +51,7 @@
     </el-card>
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span></span>
+        <span>收银台订单统计</span>
       </div>
       <div class="box-gang">
         <div class="box">

fuintAdmin/src/views/order/order_Goods.vue

@@ -81,7 +81,7 @@
     </el-card>
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span></span>
+        <span>商品交易订单统计</span>
       </div>
       <div class="box-gang">
         <div class="box">

fuintAdmin/src/views/order/order_Vip.vue

@@ -77,7 +77,7 @@
     <!--    统计-->
     <el-card class="box-card">
       <div slot="header" class="clearfix">
-        <span></span>
+        <span>会员充值订单统计</span>
       </div>
       <div class="box-gang">
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java

@@ -90,4 +90,11 @@ public interface CardValueRecordService extends IService<CardValueRecord> {
      * @return
      */
     IPage<CardValueRecord> selectCardValueRecordList(Page page, CardValueRecord cardValueRecord);
+
+    /**
+     * 会员充值总人数
+     * @param user
+     * @return
+     */
+    Integer selectUserTotal(LJUserVo user);
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java

@@ -1151,5 +1151,17 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         cardValueRecord.setStoreId(nowAccountInfo.getStoreId());
         return baseMapper.selectCardValueRecordList(page,cardValueRecord);
     }
+
+    @Override
+    public Integer selectUserTotal(LJUserVo user) {
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        if (ObjectUtil.isNotEmpty(user.getParams())){
+            queryWrapper.apply(true,"create_time BETWEEN '" + user.getParams().get("beginTime") + "' and '" + user.getParams().get("endTime") + "'");
+        }
+        queryWrapper.eq("chain_store_id",user.getChainStoreId());
+        queryWrapper.groupBy("mt_user_id");
+        List list = baseMapper.selectList(queryWrapper);
+        return list.size();
+    }
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService;
 import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens;
 import com.fuint.business.marketingActivity.cardValueChildrens.service.CardValudChildrensService;
 import com.fuint.business.storeInformation.entity.LJStore;
@@ -40,6 +41,9 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
     private ILJStoreService storeService;
     @Resource
     private LJUserMapper ljUserMapper;
+    @Resource
+    @Lazy
+    private CardValueRecordService cardValueRecordService;
 
     /**
      * 根据条件分页查询会员信息
@@ -158,13 +162,14 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
 
 //        Integer yesterdayAddNum = baseMapper.selectCount(queryWrapper1);
         Integer yesterdayAddNum = userBalanceMapper.selectCount(queryWrapper1);
-
+        Integer rechargeTotal = cardValueRecordService.selectUserTotal(user);
         map.put("balance",balance);
         map.put("point",point);
 //        map.put("literCard",literCard);
 //        map.put("refuelMoney",refuelMoney);
         map.put("addNum",addNum);
         map.put("yesterdayAddNum",yesterdayAddNum);
+        map.put("rechargeTotal",rechargeTotal);
         return map;
     }