fix 订单

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassStudentController.java

@@ -12,11 +12,10 @@ import com.zhongzheng.modules.grade.service.IClassGradeService;
 import com.zhongzheng.modules.grade.service.IClassGradeSysService;
 import com.zhongzheng.modules.grade.service.IClassGradeUserService;
 import com.zhongzheng.modules.grade.vo.*;
-import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
-import com.zhongzheng.modules.user.bo.UserEditBo;
-import com.zhongzheng.modules.user.bo.UserQueryBo;
+import com.zhongzheng.modules.user.bo.*;
 import com.zhongzheng.modules.user.service.IUserService;
 import com.zhongzheng.modules.user.service.IUserStudyRecordService;
+import com.zhongzheng.modules.user.service.IUserUpdateService;
 import com.zhongzheng.modules.user.vo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -51,6 +50,7 @@ public class ClassStudentController extends BaseController {
     private final IUserStudyRecordService iUserStudyRecordService;
 
     private final IUserService iUserService;
+    private final IUserUpdateService iUserUpdateService;
 
 
     /**
@@ -152,4 +152,27 @@ public class ClassStudentController extends BaseController {
         List<ExamSonStudyRecordVo> list = iUserStudyRecordService.listExamSon(bo);
         return getDataTable(list);
     }
+
+    /**
+     * 查询用户修改记录列表
+     */
+    @ApiOperation("查询用户修改记录列表")
+    @PreAuthorize("@ss.hasPermi('system:update:list')")
+    @GetMapping("/userUpdateList")
+    public TableDataInfo<UserUpdateVo> list(UserUpdateQueryBo bo) {
+        startPage();
+        List<UserUpdateVo> list = iUserUpdateService.queryList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 修改用户修改记录
+     */
+    @ApiOperation("修改用户修改记录")
+    @PreAuthorize("@ss.hasPermi('system:update:edit')")
+    @Log(title = "用户修改记录", businessType = BusinessType.UPDATE)
+    @PostMapping("userUpdate")
+    public AjaxResult<Void> edit(@RequestBody UserUpdateEditBo bo) {
+        return toAjax(iUserUpdateService.updateByEditBo(bo) ? 1 : 0);
+    }
 }

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

@@ -6,6 +6,7 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
@@ -39,6 +40,7 @@ import com.zhongzheng.modules.user.entity.ClientLoginUser;
 import com.zhongzheng.modules.user.mapper.UserMapper;
 import com.zhongzheng.modules.user.service.IUserPlanService;
 import com.zhongzheng.modules.user.service.IUserService;
+import com.zhongzheng.modules.user.service.IUserUpdateService;
 import com.zhongzheng.modules.user.vo.*;
 import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -86,6 +88,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Autowired
     private UserMapper userMapper;
 
+    @Autowired
+    private IUserUpdateService userUpdateService;
+
     @Autowired
     private IClassGradeUserService iClassGradeUserService;
 
@@ -243,10 +248,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         User update = BeanUtil.toBean(bo, User.class);
         validEntityBeforeUpdate(update);
         update.setUpdateTime(DateUtils.getNowTime());
-
-        //增加客户端信息进行添加积分
-
-
+        UserUpdateAddBo userUpdateAddBo = new UserUpdateAddBo();
+        if (!StringUtils.isBlank(update.getRealname())){
+            userUpdateAddBo.setRealname(update.getRealname());
+        }
+        if (!StringUtils.isBlank(update.getTelphone())){
+            userUpdateAddBo.setTelphone(update.getTelphone());
+        }
+        if (!StringUtils.isBlank(update.getIdCard())){
+            userUpdateAddBo.setIdCard(update.getIdCard());
+        }
+        if (userUpdateAddBo != null) {
+            userUpdateService.insertByAddBo(userUpdateAddBo);
+        }
         return this.updateById(update);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessAddBo.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -34,7 +36,7 @@ public class CourseBusinessAddBo {
     private Integer projectId;
     /** 学年 */
     @ApiModelProperty("学年")
-    private Long schoolYear;
+    private BigDecimal schoolYear;
     /** 0 未启用 1启用 */
     @ApiModelProperty("0 未启用 1启用")
     private Integer status;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseBusinessEditBo.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -40,7 +42,7 @@ public class CourseBusinessEditBo {
 
     /** 学年 */
     @ApiModelProperty("学年")
-    private Long schoolYear;
+    private BigDecimal schoolYear;
 
     /** 0 未启用 1启用 */
     @ApiModelProperty("0 未启用 1启用")

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseBusiness.java

@@ -34,7 +34,7 @@ private static final long serialVersionUID=1L;
     /** 项目id */
     private Integer projectId;
     /** 学年 */
-    private Long schoolYear;
+    private BigDecimal schoolYear;
     /** 0 未启用 1启用 */
     private Integer status;
     /** 添加时间 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserUpdateAddBo.java

@@ -36,4 +36,7 @@ public class UserUpdateAddBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+    /** 1已读 2未读 */
+    @ApiModelProperty("1已读 2未读")
+    private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserUpdateEditBo.java

@@ -23,7 +23,7 @@ public class UserUpdateEditBo {
 
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
-    private Long userId;
+    private Long[] userId;
 
     /** 真实姓名 */
     @ApiModelProperty("真实姓名")
@@ -40,6 +40,9 @@ public class UserUpdateEditBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
+    /** 1已读 2未读 */
+    @ApiModelProperty("1已读 2未读")
+    private Integer status;
 
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserUpdateQueryBo.java

@@ -48,4 +48,8 @@ public class UserUpdateQueryBo extends BaseEntity {
 	/** 手机号码 */
 	@ApiModelProperty("手机号码")
 	private String telphone;
+
+	/** 1已读 2未读 */
+	@ApiModelProperty("1已读 2未读")
+	private Integer status;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/domain/UserUpdate.java

@@ -40,4 +40,7 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
+
+    /** 1已读 2未读 */
+    private Integer status;
 }

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

@@ -79,9 +79,12 @@ public class UserUpdateServiceImpl extends ServiceImpl<UserUpdateMapper, UserUpd
     @Override
     public Boolean updateByEditBo(UserUpdateEditBo bo) {
         UserUpdate update = BeanUtil.toBean(bo, UserUpdate.class);
+        LambdaQueryWrapper<UserUpdate> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, UserUpdate::getUserId, bo.getUserId());
         validEntityBeforeSave(update);
+        update.setStatus(1);
         update.setUpdateTime(DateUtils.getNowTime());
-        return this.updateById(update);
+        return this.update(update,lqw);
     }
 
     /**

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

@@ -40,4 +40,8 @@ public class UserUpdateVo {
 	@Excel(name = "手机号码")
 	@ApiModelProperty("手机号码")
 	private String telphone;
+
+	/** 1已读 2未读 */
+	@ApiModelProperty("1已读 2未读")
+	private Integer status;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseBusinessMapper.xml

@@ -65,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="id != null and id != ''">
             AND b.id = #{id}
         </if>
-        order by b.update_time desc
+        order by b.create_time desc
     </select>
 
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -213,7 +213,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             OR ( qb.type = 3 AND ga.type = 2 )
             OR ( qb.type = 2 AND ga.type = 3 )) AND qb.subject_id = #{subjectId}
         </if>
-        ORDER BY g.update_time DESC
+        ORDER BY g.create_time DESC
     </select>
 
     <select id="selectDetail" parameterType="Long" resultMap="GoodsResultVo">

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -290,7 +290,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         u.id_card,
         cgu.grade_id,
         u.telphone,
-        (case WHEN (select COUNT(uu.id) FROM user_update uu where cgu.user_id = uu.user_id) >0 then 1 ELSE 0 end) as user_status,
+        (case WHEN (select COUNT(uu.id) FROM user_update uu where cgu.user_id = uu.user_id and uu.status = 2) >0 then 1 ELSE 0 end) as user_status,
         (SELECT g.class_hours FROM goods g LEFT JOIN class_grade_goods cgg on cgg.goods_id = g.goods_id where cg.grade_id = cgg.grade_id) as class_hours,
         cgu.period_status,
         cgu.finish_status,