fix 控制台

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -254,13 +254,11 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         validEntityBeforeUpdate(update);
         update.setUpdateTime(DateUtils.getNowTime());
         UserUpdateAddBo userUpdateAddBo = new UserUpdateAddBo();
-        Boolean isUpdateInfo = false;
         UserVo oldUser = queryById(bo.getUserId());
         if (!StringUtils.isBlank(update.getRealname())){
             if(!oldUser.getRealname().equals(update.getRealname())){
                 userUpdateAddBo.setUserId(bo.getUserId());
                 userUpdateAddBo.setRealname(update.getRealname());
-                isUpdateInfo = true;
             }
         }
         if (!StringUtils.isBlank(update.getTelphone())){
@@ -273,7 +271,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 }
                 userUpdateAddBo.setUserId(bo.getUserId());
                 userUpdateAddBo.setTelphone(update.getTelphone());
-                isUpdateInfo = true;
             }
 
         }
@@ -286,10 +283,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 }
                 userUpdateAddBo.setUserId(bo.getUserId());
                 userUpdateAddBo.setIdCard(update.getIdCard());
-                isUpdateInfo = true;
             }
         }
-        if (isUpdateInfo) {
+        if (Validator.isNotEmpty(userUpdateAddBo.getUserId())) {
             userUpdateService.insertByAddBo(userUpdateAddBo);
         }
         return this.updateById(update);

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ConsoleServiceImpl.java

@@ -6,12 +6,12 @@ import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.base.service.IConsoleService;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.user.service.IUserService;
+import com.zhongzheng.modules.user.service.IUserUpdateService;
+import com.zhongzheng.modules.user.vo.UserUpdateVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
 
 
 @Service
@@ -20,21 +20,43 @@ public class ConsoleServiceImpl implements IConsoleService {
     @Autowired
     private IOrderService iOrderService;
 
+    @Autowired
+    private IUserUpdateService iUserUpdateService;
+
     @Override
     public Map<String, Object> getStudentData(ConsoleQueryBo bo) {
-        Integer allNum = iOrderService.getConsoleStudentNum(bo);
+        Integer allNum = iOrderService.getConsoleStudentNum(bo); //总人数
         Calendar cal = Calendar.getInstance();
         cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
-        bo.setEndTime(cal.getTimeInMillis() / 1000);
+        Long todZero = cal.getTimeInMillis() / 1000;  //今天凌晨
+        bo.setEndTime(todZero);
         cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH)-1, 0, 0, 0);
-        bo.setStartTime(cal.getTimeInMillis() / 1000);
+        Long ytdZero = cal.getTimeInMillis() / 1000;   //昨天凌晨
+        bo.setStartTime(ytdZero);
 
         Integer yesNum = iOrderService.getConsoleStudentNum(bo); //昨天人数
-        System.out.println(Calendar.DAY_OF_MONTH);
-        System.out.println(bo);
         Map<String, Object> map = new HashMap<>();
         map.put("allStudent",allNum);
         map.put("ytdStudent",yesNum);
+
+        bo.setEndTime(DateUtils.getNowTime());
+        bo.setStartTime(todZero);
+        Integer todUpdateNum = iOrderService.getConsoleInfoUpdateNum(bo);  //今天更新数量
+        bo.setEndTime(todZero);
+        bo.setStartTime(ytdZero);
+        Integer ytdUpdateNum = iOrderService.getConsoleInfoUpdateNum(bo);  //今天更新数量
+        bo.setEndTime(DateUtils.getNowTime());
+        Calendar cal7 = new GregorianCalendar();
+        cal7.add(Calendar.DATE,-6); //7天内
+        cal7.set(cal7.get(Calendar.YEAR), cal7.get(Calendar.MONTH), cal7.get(Calendar.DAY_OF_MONTH), 0, 0, 0);
+        Long sevenZero = cal7.getTimeInMillis() / 1000;   //7日内凌晨
+        bo.setStartTime(sevenZero);
+        Integer sevenUpdateNum = iOrderService.getConsoleInfoUpdateNum(bo);  //7日内更新数量
+        map.put("todUpdateNum",todUpdateNum);
+        map.put("ytdUpdateNum",ytdUpdateNum);
+        map.put("sevenUpdateNum",sevenUpdateNum);
+        List<UserUpdateVo> list =  iUserUpdateService.getLastThree(bo);
+        map.put("lastUpdateList",list);
         return map;
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderService.java

@@ -86,4 +86,6 @@ public interface IOrderService extends IService<Order> {
 	Map<String, String> resumePcOrder(OrderAddBo bo);
 
 	Integer getConsoleStudentNum(ConsoleQueryBo bo);
+
+	Integer getConsoleInfoUpdateNum(ConsoleQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -1033,6 +1033,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return baseMapper.getConsoleStudentNum(bo);
     }
 
+    @Override
+    public Integer getConsoleInfoUpdateNum(ConsoleQueryBo bo) {
+        return baseMapper.getConsoleInfoUpdateNum(bo);
+    }
+
     //判断视频商品是否购买过且服务期是否过期
     public Long getHaveBuyGoods(Long goodsId, Long userId) {
         OrderGoodsQueryBo orderGoodsQueryBo = new OrderGoodsQueryBo();

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/mapper/UserUpdateMapper.java

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.user.mapper;
 
+import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.user.domain.UserUpdate;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.user.vo.UserUpdateVo;
+
+import java.util.List;
 
 /**
  * 用户修改记录Mapper接口
@@ -10,5 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @date 2021-11-23
  */
 public interface UserUpdateMapper extends BaseMapper<UserUpdate> {
-
+    List<UserUpdateVo> getLastThree(ConsoleQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/IUserUpdateService.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.user.service;
 
+import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import com.zhongzheng.modules.user.domain.UserUpdate;
 import com.zhongzheng.modules.user.vo.UserUpdateVo;
 import com.zhongzheng.modules.user.bo.UserUpdateQueryBo;
@@ -35,6 +36,8 @@ public interface IUserUpdateService extends IService<UserUpdate> {
 	 */
 	Boolean insertByAddBo(UserUpdateAddBo bo);
 
+	List<UserUpdateVo> getLastThree(ConsoleQueryBo bo);
+
 	/**
 	 * 根据编辑业务对象修改用户修改记录
 	 * @param bo 用户修改记录编辑业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/service/impl/UserUpdateServiceImpl.java

@@ -1,8 +1,11 @@
 package com.zhongzheng.modules.user.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
+import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.base.bo.ConsoleQueryBo;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -76,6 +79,11 @@ public class UserUpdateServiceImpl extends ServiceImpl<UserUpdateMapper, UserUpd
         return this.save(add);
     }
 
+    @Override
+    public List<UserUpdateVo> getLastThree(ConsoleQueryBo bo) {
+        return baseMapper.getLastThree(bo);
+    }
+
     @Override
     public Boolean updateByEditBo(UserUpdateEditBo bo) {
         UserUpdate update = BeanUtil.toBean(bo, UserUpdate.class);
@@ -93,6 +101,9 @@ public class UserUpdateServiceImpl extends ServiceImpl<UserUpdateMapper, UserUpd
      * @param entity 实体类数据
      */
     private void validEntityBeforeSave(UserUpdate entity){
+        if(Validator.isEmpty(entity.getUserId())){
+            throw new CustomException("用户信息更新记录失败");
+        }
         //TODO 做一些数据校验,如唯一约束
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/vo/UserUpdateVo.java

@@ -48,4 +48,6 @@ public class UserUpdateVo {
 	@ApiModelProperty("创建时间")
 	private Long createTime;
 
+	@ApiModelProperty("最新的真实姓名")
+	private String nowRealname;
 }

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -380,7 +380,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN goods g ON og.goods_id = g.goods_id
         LEFT JOIN user_update uu on o.user_id = uu.user_id
         WHERE
-
         og.pay_status IN ( 2, 3, 4 )
         AND og.refund_status != 2
         <if test="businessId != null">
@@ -393,4 +392,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND #{endTime} >= uu.create_time
         </if>
     </select>
+
+
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/user/UserUpdateMapper.xml

@@ -14,5 +14,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.user.vo.UserUpdateVo" id="UserUpdateVoResult">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="realname" column="realname"/>
+        <result property="idCard" column="id_card"/>
+        <result property="telphone" column="telphone"/>
+        <result property="nowRealname" column="now_realname"/>
+    </resultMap>
 
+    <select id="getLastThree" parameterType="com.zhongzheng.modules.base.bo.ConsoleQueryBo" resultMap="UserUpdateVoResult">
+        SELECT
+            uu.*,
+            u.realname AS now_realname
+        FROM
+            `order` o
+                LEFT JOIN order_goods og ON o.order_sn = og.order_sn
+                LEFT JOIN goods g ON og.goods_id = g.goods_id
+                LEFT JOIN user_update uu on o.user_id = uu.user_id
+                LEFT JOIN `user` u ON uu.user_id = u.user_id
+        WHERE
+            uu.user_id IS NOT NULL
+        AND
+        og.pay_status IN ( 2, 3, 4 )
+        AND og.refund_status != 2
+        <if test="businessId != null">
+            AND g.business_id = #{businessId}
+        </if>
+        ORDER BY
+            uu.id DESC
+            LIMIT 3
+    </select>
 </mapper>