|
@@ -132,6 +132,58 @@ public class ConsumptionRecordServiceImpl extends ServiceImpl<ConsumptionRecordM
|
|
|
return pageList;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public Page<ConsumptionRecord> userPage(ConsumptionRecordPageParam consumptionRecordPageParam) {
|
|
|
+ QueryWrapper<ConsumptionRecord> queryWrapper = new QueryWrapper<ConsumptionRecord>().checkSqlInjection();
|
|
|
+ if(ObjectUtil.isNotEmpty(consumptionRecordPageParam.getUserName())){
|
|
|
+ queryWrapper.like("su.name",consumptionRecordPageParam.getUserName());
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(consumptionRecordPageParam.getConsumptionOperate())){
|
|
|
+ List<String> list = Arrays.asList(consumptionRecordPageParam.getConsumptionOperate().split(","));
|
|
|
+ queryWrapper.in("cr.consumption_operate",list);
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(consumptionRecordPageParam.getOrgId())){
|
|
|
+ queryWrapper.eq("cr.consumption_org",consumptionRecordPageParam.getOrgId());
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(consumptionRecordPageParam.getConsumptionTimeBegin()) &&
|
|
|
+ ObjectUtil.isNotEmpty(consumptionRecordPageParam.getConsumptionTimeEnd())){
|
|
|
+ queryWrapper.between("cr.consumption_time",consumptionRecordPageParam.getConsumptionTimeBegin()+" 00:00:00",consumptionRecordPageParam.getConsumptionTimeEnd()+" 23:59:59");
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(consumptionRecordPageParam.getAdjustType())){
|
|
|
+ queryWrapper.eq("cr.adjust_type",consumptionRecordPageParam.getAdjustType());
|
|
|
+ }
|
|
|
+ if(ObjectUtil.isNotEmpty(consumptionRecordPageParam.getRecordId())){
|
|
|
+ List<String> idList = Lists.newArrayList();
|
|
|
+ bizUserService.list(new QueryWrapper<BizUser>().lambda().
|
|
|
+ eq(BizUser::getReferralUser, consumptionRecordPageParam.getRecordId())).
|
|
|
+ forEach(user->idList.add(user.getId()));
|
|
|
+ queryWrapper.in("cr.user_id",idList);
|
|
|
+ }
|
|
|
+ // 校验数据范围
|
|
|
+ queryWrapper.in("cr.user_id", StpLoginUserUtil.getLoginUser().getId());
|
|
|
+ queryWrapper.eq("cr.DELETE_FLAG","NOT_DELETE");
|
|
|
+ queryWrapper.orderByDesc("cr.create_time");
|
|
|
+ Page<ConsumptionRecord> pageList = this.getBaseMapper().getPageList(CommonPageRequest.defaultPage(), queryWrapper);
|
|
|
+ for(ConsumptionRecord consumptionRecord : pageList.getRecords()){
|
|
|
+ if(ObjectUtil.isNotEmpty(consumptionRecord.getPhone())){
|
|
|
+ consumptionRecord.setPhone(CommonCryptogramUtil.doSm4CbcDecrypt(consumptionRecord.getPhone()));
|
|
|
+ }
|
|
|
+ if(StringUtils.equals(consumptionRecord.getConsumptionOperate(),"3") || StringUtils.equals(consumptionRecord.getConsumptionOperate(),"4")){
|
|
|
+ //消费结算,设置下说明
|
|
|
+ if(StringUtils.equals(consumptionRecord.getConsumptionType(),"1")){
|
|
|
+ consumptionRecord.setConsumptionRemark("积分消费"+consumptionRecord.getVoucherMoney().stripTrailingZeros().toPlainString()+"个");
|
|
|
+ }
|
|
|
+ if(StringUtils.equals(consumptionRecord.getConsumptionType(),"2")){
|
|
|
+ consumptionRecord.setConsumptionRemark("糕点消费"+consumptionRecord.getAccountMoney().stripTrailingZeros().toPlainString()+"个");
|
|
|
+ }
|
|
|
+ if(StringUtils.equals(consumptionRecord.getConsumptionType(),"3")){
|
|
|
+ consumptionRecord.setConsumptionRemark("积分消费"+consumptionRecord.getVoucherMoney().stripTrailingZeros().toPlainString()+"个"+",糕点消费"+consumptionRecord.getAccountMoney().stripTrailingZeros().toPlainString()+"个");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return pageList;
|
|
|
+ }
|
|
|
+
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
@Override
|
|
|
public void add(ConsumptionRecordAddParam consumptionRecordAddParam) {
|