管理端用户查询修改累计充值金额

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -126,12 +126,11 @@
         <where>
              is_delete=0
 
-            <if test="endTime != null">and #{endTime}</if>
-
             <if test="startTime != null">
                 and create_time
                 between #{startTime}
             </if>
+            <if test="endTime != null">and #{endTime}</if>
 
             <if test="userName != null">and user_name like ('%' #{userName} '%')</if>
 

wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserInfoDto.java

@@ -79,6 +79,24 @@ public class UserInfoDto implements Serializable {
     @ApiModelProperty(value = "用户充值总金额", name = "moneyAmount")
     private String moneyAmount;
 
+    /**
+     * 用户充值次数
+     */
+    @ApiModelProperty(value ="充值卡充值总次数",name = "RechargeTimes")
+    private int rechargeTimes;
+
+    /**
+     * 用户微信充值总金额
+     */
+    @ApiModelProperty(value ="用户微信充值总金额",name = "WeChatMoney")
+    private String weChatMoney;
+
+    /**
+     * 用户支付宝充值总金额
+     */
+    @ApiModelProperty(value ="用户支付宝充值总金额",name = "AlipayMoney")
+    private String alipayMoney;
+
     /**
      * ip
      */

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

@@ -70,7 +70,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         Map<String, Object> map = new HashMap<>(8);
 
         //将参数放入容器中
-        map.put("pageNo", (pageNum - 1) * pageSize);
+        map.put("pageNo", (pageNum-1)*pageSize);
         map.put("pageSize", pageSize);
         map.put("startTime", queryVo.getStartTime());
         map.put("endTime", queryVo.getEndTime());
@@ -91,43 +91,60 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
                 userInfoDto.setCultureGrade(scoreInfo.getCultureGrade().toString());
                 userInfoDto.setMajorGrade(scoreInfo.getMajorGrade().toString());
             }
-            LoginRecord loginRecord = loginRecordMapper.getById(user.getId());
-            if (null != loginRecord) {
-                userInfoDto.setLastLoginTime(loginRecord.getUpdateTime());
-                userInfoDto.setIp(loginRecord.getIp());
-            }
-            UserLimit userLimit = userLimitMapper.getByUserId(user.getId());
-
-            if (null != userLimit) {
-                userInfoDto.setQueryLimit(userLimit.getUsableLimit());
-            }
-            List<PayRecord> byId = payRecordMapper.getById(user.getId());
+                LoginRecord loginRecord = loginRecordMapper.getById(user.getId());
+                if (null != loginRecord) {
+                    userInfoDto.setLastLoginTime(loginRecord.getUpdateTime());
+                    userInfoDto.setIp(loginRecord.getIp());
+                }
+                UserLimit userLimit = userLimitMapper.getByUserId(user.getId());
 
-            if (!CollectionUtils.isEmpty(byId)) {
-                //计算累计充值金额
-                Integer sumMoney = 0;
-                for (PayRecord payRecord : byId) {
-                    sumMoney += payRecord.getMoney();
+                if (null != userLimit) {
+                    userInfoDto.setQueryLimit(userLimit.getUsableLimit());
+                }
+                List<PayRecord> byId = payRecordMapper.getById(user.getId());
+
+                if (!CollectionUtils.isEmpty(byId)) {
+                    //计算充值卡充值次数
+                    Integer rechargeTimes = 0;
+
+                    //支付宝充值总金额
+                    Integer alipayMoney=0;
+
+                    //微信充值总金额
+                    Integer weChatMoney=0;
+                    for (PayRecord payRecord : byId) {
+                        if (payRecord.getType()==1) {
+                            alipayMoney+=Integer.valueOf(payRecord.getMoney());
+                        }
+
+                        if (payRecord.getType()==2) {
+                            weChatMoney+=Integer.valueOf(payRecord.getMoney());
+                        }
+
+                        if (payRecord.getType()==3) {
+                            rechargeTimes+=1;
+                        }
+                    }
+                    userInfoDto.setWeChatMoney(weChatMoney.toString());
+                    userInfoDto.setAlipayMoney(alipayMoney.toString());
+                    userInfoDto.setRechargeTimes(rechargeTimes);
                 }
 
-                userInfoDto.setMoneyAmount(sumMoney.toString());
+                //将消息进行同步
+                BeanUtils.copyProperties(user, userInfoDto);
+                userInfoDto.setUserId(user.getId());
+                userInfoDto.setRegisterTime(user.getCreateTime());
+                list.add(userInfoDto);
             }
 
-            //将消息进行同步
-            BeanUtils.copyProperties(user, userInfoDto);
-            userInfoDto.setUserId(user.getId());
-            userInfoDto.setRegisterTime(user.getCreateTime());
-            list.add(userInfoDto);
-        }
-
-        PageInfo<UserInfoDto> info = new PageInfo<>();
-        info.setPageSize(pageSize);
-        info.setPageNum(pageNum);
-        info.setTotal(usersMapper.getUserNumbers(map));
-        info.setList(list);
+            PageInfo<UserInfoDto> info = new PageInfo<>();
+            info.setPageSize(pageSize);
+            info.setPageNum(pageNum);
+            info.setTotal(usersMapper.getUserNumbers(map));
+            info.setList(list);
 
-        return R.ok(info);
-    }
+            return R.ok(info);
+        }
 
 
     @Override
@@ -143,12 +160,6 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
             return R.error("用户信息不存在!");
         }
 
-        //检查成绩信息
-        R<Boolean> booleanR = volunteerManager.checkScore(userInfo.getScoreInfo());
-        if (null != booleanR && booleanR.getCode() == 1) {
-            return R.error(booleanR.getMessage());
-        }
-
         //2、要提交的用户信息
         user.setSchool(userInfo.getSchool());
         user.setSex(userInfo.getSex());
@@ -195,11 +206,6 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         user.setExamType(userDto.getStudentType());
         user.setUserName(userDto.getUserName());
 
-        //检查成绩信息
-        R<Boolean> booleanR = volunteerManager.checkScore(userDto.getScoreInfo());
-        if (null != booleanR && booleanR.getCode() == 1) {
-            return R.error(booleanR.getMessage());
-        }
 
         //3、要提交的用户的成绩信息
         ScoreInfo scoreInfo = scoreInfoMapper.getById(userDto.getUserId());
@@ -259,11 +265,11 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
 
     @Override
     public R<List<User>> test() {
-        List<String> names = new ArrayList<>();
+        List<String> names=new ArrayList<>();
         names.add("黎楚川");
         names.add("陈成");
         names.add("雷青松");
-        List<User> list = usersMapper.test(names);
+        List<User> list=usersMapper.test(names);
         return R.ok(list);
     }
 
@@ -288,5 +294,4 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         orderQueryVo.setPageNo(pageNum);
         orderQueryVo.setPageSize(pageSize);
     }
-
 }