liujie
2023-08-09 4fd57c9e370cd80d2df7dafd958521e304f9c3fc
后台代码
4个文件已修改
16 ■■■■ 已修改文件
cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/mapper/UserIntegralChangesMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-account/src/main/java/com/dsh/account/controller/UserIntegralChangesController.java
@@ -39,15 +39,15 @@
    }
    @PostMapping("/userIntegralChanges/list")
    public List<UserIntegral> list(@RequestBody IntegralListQuery integralListQuery){
    public Page<UserIntegral> list(@RequestBody IntegralListQuery integralListQuery){
        try {
            Page<UserIntegral> userIntegralPage = new Page<>(integralListQuery.getOffset(), integralListQuery.getLimit());
            List<UserIntegral> list = userIntegralChangesService.listAll(userIntegralPage,integralListQuery);
            Page<UserIntegral> list = userIntegralChangesService.listAll(userIntegralPage,integralListQuery);
            return list;
        }catch (Exception e){
            e.printStackTrace();
            return new ArrayList<>();
            return new Page<>();
        }
    }
}
cloud-server-account/src/main/java/com/dsh/account/mapper/UserIntegralChangesMapper.java
@@ -19,5 +19,5 @@
 */
public interface UserIntegralChangesMapper extends BaseMapper<UserIntegralChanges> {
    List<UserIntegral> listAll(@Param("userIntegralPage") Page<UserIntegral> userIntegralPage, @Param("query") IntegralListQuery integralListQuery, @Param("sTime") String sTime, @Param("eTime") String eTime);
    Page<UserIntegral> listAll(@Param("userIntegralPage") Page<UserIntegral> userIntegralPage, @Param("query") IntegralListQuery integralListQuery, @Param("sTime") String sTime, @Param("eTime") String eTime);
}
cloud-server-account/src/main/java/com/dsh/account/service/UserIntegralChangesService.java
@@ -37,7 +37,7 @@
    PointDetailsVo queryRedemptionDetails(Integer detailsId);
    List<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery);
    Page<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery);
}
cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
@@ -145,15 +145,15 @@
    }
    @Override
    public List<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery) {
    public Page<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery) {
        String sTime =null;
        String eTime =null;
        if(ToolUtil.isNotEmpty(integralListQuery.getTime())){
            sTime = integralListQuery.getTime().split(" - ")[0]+" 00:00:00";
            eTime = integralListQuery.getTime().split(" - ")[1]+" 23:59:59";
        }
        List<UserIntegral> userIntegrals = this.baseMapper.listAll(userIntegralPage, integralListQuery, sTime, eTime);
        for (UserIntegral userIntegral : userIntegrals) {
        Page<UserIntegral> userIntegrals = this.baseMapper.listAll(userIntegralPage, integralListQuery, sTime, eTime);
        for (UserIntegral userIntegral : userIntegrals.getRecords()) {
            if(userIntegral.getCategory()==1){
                userIntegral.setIntegral(userIntegral.getNewIntegral()-userIntegral.getOldIntegral());
            }else {