问题9

ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusIntegralConsumeController.java

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.sql.Wrapper;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -43,10 +44,25 @@ public class BusIntegralConsumeController extends BaseController
     public TableDataInfo list(BusIntegralRecord busIntegralRecord)
     {
         busIntegralRecord.setUpdateType("消耗账分");
-        busIntegralRecord.setAccount(SecurityUtils.getLoginUser().getUsername());
+        List<String> list = new ArrayList<>();
+        BusAgentInfo agentInfo =  new BusAgentInfo();
+        agentInfo.setAgentAccount(SecurityUtils.getLoginUser().getUsername());
+        BusAgentInfo temp = agentInfoService.selectBusAgentInfoList(agentInfo).get(0);
+        list.add(SecurityUtils.getLoginUser().getUsername());
+        if (temp.getSuperiorAgentCode() == 1L) {
+            BusAgentInfo agentInfo1 =  new BusAgentInfo();
+            agentInfo1.setSuperiorAgentCode(temp.getId());
+            List<BusAgentInfo> subList = agentInfoService.selectBusAgentInfoList(agentInfo1);
+            for (BusAgentInfo info : subList) {
+                list.add(info.getAgentAccount());
+            }
+        }
+
+        busIntegralRecord.setAgentAccount(list);
+
         startPage();
-        List<BusIntegralRecord> list = busIntegralRecordService.selectBusIntegralRecordList(busIntegralRecord);
+        List<BusIntegralRecord> list1 = busIntegralRecordService.selectBusIntegralRecordList(busIntegralRecord);
-        return getDataTable(list);
+        return getDataTable(list1);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/business/domain/BusIntegralRecord.java

@@ -1,6 +1,8 @@
 package com.ruoyi.business.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -45,6 +47,16 @@ public class BusIntegralRecord extends BaseEntity
     @Excel(name = "积分余额")
     private int integralBalance;
 
+    private List<String> agentAccount;
+
+    public List<String> getAgentAccount() {
+        return agentAccount;
+    }
+
+    public void setAgentAccount(List<String> agentAccount) {
+        this.agentAccount = agentAccount;
+    }
+
     /** 代理备注 */
     @Excel(name = "代理备注")
     private String agentRemark;

ruoyi-system/src/main/java/com/ruoyi/business/service/impl/BusReturnVisitInfoServiceImpl.java

@@ -47,6 +47,7 @@ public class BusReturnVisitInfoServiceImpl implements IBusReturnVisitInfoService
     @Override
     public List<BusReturnVisitInfo> selectBusReturnVisitInfoList(BusReturnVisitInfo busReturnVisitInfo)
     {
+        if(busReturnVisitInfo.getStoreCode() == null) {
             BusStoreInfo info = new BusStoreInfo();
             info.setBindId(SecurityUtils.getLoginUser().getUserId());
             List<BusStoreInfo> list = storeInfoMapper.selectBusStoreInfoList(info);
@@ -54,6 +55,7 @@ public class BusReturnVisitInfoServiceImpl implements IBusReturnVisitInfoService
                 String storeCode = list.get(0).getStoreCode();
                 busReturnVisitInfo.setStoreCode(storeCode);
             }
+        }
         PageUtils.startPage();
         String beginTime = null;
         String endTime = null;

ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml

@@ -23,13 +23,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectBusIntegralRecordList" parameterType="BusIntegralRecord" resultMap="BusIntegralRecordResult">
         <include refid="selectBusIntegralRecordVo"/>
         <where>
-            <if test="account != null  and account != ''"> and account = #{account}</if>
             <if test="platform != null  and platform != ''"> and platform = #{platform}</if>
             <if test="updateType != null  and updateType != ''"> and update_type = #{updateType}</if>
-<!--            <if test="integralUpdateNum != null "> and Integral_update_num = #{integralUpdateNum}</if>-->
             <if test="integralUpdateTime != null "> and Integral_update_time = #{integralUpdateTime}</if>
-<!--            <if test="integralBalance != null "> and Integral_balance = #{integralBalance}</if>-->
             <if test="agentRemark != null  and agentRemark != ''"> and agent_remark = #{agentRemark}</if>
+            and account in
+            <foreach collection="agentAccount" open="(" close=")" item="account" separator="," index="i">
+                #{account}
+            </foreach>
+            <if test="account != null  and account != ''"> and account = #{account}</if>
         </where>
     </select>
 

ruoyi-ui/src/views/point/consume/index.vue

@@ -75,7 +75,7 @@
       <el-table-column label="账号" align="center" prop="account" />
       <el-table-column label="变更类型" align="center" prop="updateType" />
       <el-table-column label="账分消耗" align="center" prop="integralUpdateNum" />
-      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="日期" align="center" prop="integralUpdateTime" />
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
 <!--        <template slot-scope="scope">-->
 <!--          <el-button-->

ruoyi-ui/src/views/statistics/visit/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="营销源名称" prop="roleName">
+      <el-form-item label="营销源名称" prop="storeName">
         <el-input
           v-model="queryParams.storeName"
           placeholder="请输入营销源名称"
@@ -10,7 +10,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="营销源标识" prop="roleKey">
+      <el-form-item label="营销源标识" prop="storeCode">
         <el-input
           v-model="queryParams.storeCode"
           placeholder="请输入营销源标识"
@@ -19,7 +19,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="仅当前账号" prop="status">
+      <el-form-item label="仅当前账号" prop="isUser">
         <el-select
           v-model="queryParams.isUser"
           placeholder="请选择"