|
@@ -19,10 +19,13 @@ import cn.hutool.core.util.StrUtil;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
+import jakarta.annotation.Resource;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
|
|
+import vip.xiaonuo.biz.modular.rechargerecord.entity.BizRechargeRecord;
|
|
|
|
+import vip.xiaonuo.biz.modular.rechargerecord.service.BizRechargeRecordService;
|
|
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
|
|
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
@@ -47,6 +50,9 @@ import java.util.List;
|
|
@Service
|
|
@Service
|
|
public class BizCouponRecordServiceImpl extends ServiceImpl<BizCouponRecordMapper, BizCouponRecord> implements BizCouponRecordService {
|
|
public class BizCouponRecordServiceImpl extends ServiceImpl<BizCouponRecordMapper, BizCouponRecord> implements BizCouponRecordService {
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
+ private BizRechargeRecordService bizRechargeRecordService;
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public Page<BizCouponRecord> page(BizCouponRecordPageParam bizCouponRecordPageParam) {
|
|
public Page<BizCouponRecord> page(BizCouponRecordPageParam bizCouponRecordPageParam) {
|
|
QueryWrapper<BizCouponRecord> queryWrapper = new QueryWrapper<BizCouponRecord>().checkSqlInjection();
|
|
QueryWrapper<BizCouponRecord> queryWrapper = new QueryWrapper<BizCouponRecord>().checkSqlInjection();
|
|
@@ -120,6 +126,10 @@ public class BizCouponRecordServiceImpl extends ServiceImpl<BizCouponRecordMappe
|
|
eq(BizCouponRecord::getCouponNo, bizCouponRecordPageParam.getCouponNo()).
|
|
eq(BizCouponRecord::getCouponNo, bizCouponRecordPageParam.getCouponNo()).
|
|
eq(BizCouponRecord::getCouponStatus,"0").
|
|
eq(BizCouponRecord::getCouponStatus,"0").
|
|
last("limit 1"));
|
|
last("limit 1"));
|
|
|
|
+ BizRechargeRecord rechargeRecord = bizRechargeRecordService.getById(bizCouponRecord.getRechargeRecordId());
|
|
|
|
+ if(ObjectUtil.isNotEmpty(rechargeRecord)){
|
|
|
|
+ bizCouponRecord.setCouponMoney(rechargeRecord.getCouponAmount());
|
|
|
|
+ }
|
|
return bizCouponRecord;
|
|
return bizCouponRecord;
|
|
}
|
|
}
|
|
|
|
|