| | |
|---|
| | | } |
|---|
| | | |
|---|
| | | @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 { |
|---|
