| | |
| | | } |
| | | |
| | | @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<>(); |
| | | } |
| | | } |
| | | } |
| | |
| | | */ |
| | | 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); |
| | | } |
| | |
| | | |
| | | PointDetailsVo queryRedemptionDetails(Integer detailsId); |
| | | |
| | | List<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery); |
| | | Page<UserIntegral> listAll(Page<UserIntegral> userIntegralPage, IntegralListQuery integralListQuery); |
| | | |
| | | |
| | | } |
| | |
| | | } |
| | | |
| | | @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 { |