修改集团查看积分规则，集团查看客户积分

yijia-integral/src/main/java/com/yijia/integral/controller/CustomerPointsController.java

@@ -47,7 +47,7 @@ public class CustomerPointsController extends BaseController
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
         SysDept sysDept = deptService.selectDeptById(currentUser.getUser().getDeptId());
-        List<String> list = deptService.deptIntegralInfoList(sysDept);
+        List<String> list = deptService.deptCardInfoList(sysDept);
         if(list!=null && list.size()>0){
             customerPoints.setStationIdList(list);
             customerPoints.setStationId(null);

yijia-integral/src/main/java/com/yijia/integral/controller/IntegralRuleController.java

@@ -47,14 +47,12 @@ public class IntegralRuleController extends BaseController
     public TableDataInfo list(IntegralRule integralRule)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
-//        SysDept dept =new SysDept();
-//        dept.setDeptId(currentUser.getUser().getDeptId());
-//        List<String> list = sysDeptService.selectDeptId(dept);
-//        if(list!=null && list.size()>0){
-//            integralRule.setStationIdList(list);
-//            integralRule.setStationId(null);
-//        }
-        integralRule.setStationId(currentUser.getUser().getDeptId());
+        SysDept sysDept = sysDeptService.selectDeptById(currentUser.getUser().getDeptId());
+        List<String> list = sysDeptService.deptIntegralInfoList(sysDept);
+        if(list!=null && list.size()>0){
+            integralRule.setStationIdList(list);
+            integralRule.setStationId(null);
+        }
         startPage();
         List<IntegralRule> integralRuleList = integralRuleService.selectIntegralRuleList(integralRule);
         return getDataTable(integralRuleList);
@@ -86,13 +84,6 @@ public class IntegralRuleController extends BaseController
     public AjaxResult listRuleOne(IntegralRule integralRule)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
-//        SysDept dept =new SysDept();
-//        dept.setDeptId(currentUser.getUser().getDeptId());
-//        List<String> list = sysDeptService.selectDeptId(dept);
-//        if(list!=null && list.size()>0){
-//            integralRule.setStationIdList(list);
-//            integralRule.setStationId(null);
-//        }
         integralRule.setStationId(currentUser.getUser().getDeptId());
         IntegralRule rule = integralRuleService.selectIntegralRule(integralRule);
         return AjaxResult.success(rule);

yijia-integral/src/main/java/com/yijia/integral/service/impl/IntegralRuleServiceImpl.java

@@ -41,8 +41,6 @@ public class IntegralRuleServiceImpl implements IIntegralRuleService
     @Autowired
     private IntegralRuleDetailMapper integralRuleDetailMapper;
     @Autowired
-    private IntegralShopPicMapper integralShopPicMapper;
-    @Autowired
     private CustomerGradeSettingMapper customerGradeSettingMapper;
     @Autowired
     private SysDictDataMapper dictDataMapper;
@@ -143,6 +141,8 @@ public class IntegralRuleServiceImpl implements IIntegralRuleService
                 }
             }
         }
+        System.out.println("--------------------"+integralRule.getIntegralEmptyTime());
+        System.out.println("--------------------"+integralRule.getEmptyDate());
         int i =integralRuleMapper.insertIntegralRule(integralRule);
       //  IntegralRule rule=  integralRuleMapper.insertIntegralRule(integralRule);
         //判断规则明细
@@ -218,6 +218,8 @@ public class IntegralRuleServiceImpl implements IIntegralRuleService
                 }
             }
         }
+        System.out.println("--------------------"+integralRule.getIntegralEmptyTime());
+        System.out.println("--------------------"+integralRule.getEmptyDate());
         return  integralRuleMapper.updateIntegralRule(integralRule);
     }
 

yijia-integral/src/main/resources/mapper/integral/CustomerPointsRecordMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderNo"    column="order_no"    />
     </resultMap>
     <sql id="selectCustomerPointsRecordVo">
-        select id, union_id, customer_name, record_type, integral, create_time, station_id, d.dept_name  as station_name,order_no
+        select id, union_id, customer_name, record_type, integral, p.create_time, station_id, d.dept_name  as station_name,order_no
         from customer_points_record p join sys_dept d on p.station_id = d.dept_id
     </sql>