diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java index e5974c845..45b4145bc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java @@ -128,6 +128,21 @@ public class CardValueRecordController extends BaseController { return getSuccessResult(this.cardValueRecordService.selectCardRecord(page, cardValueRecord)); } + /** + * 查询用户的囤油充值记录 + * @param pageNo + * @param pageSize + * @param cardValueRecord + * @return + */ + @GetMapping("selectFuleRecord") + public ResponseObject selectFuleRecord(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo, + @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize, + @Param("cardValueRecord") CardValueRecordDTO cardValueRecord) { + Page page = new Page(pageNo, pageSize); + return getSuccessResult(this.cardValueRecordService.selectFuleRecord(page, cardValueRecord)); + } + /** * 查询用户的储值充值记录 和囤油充值记录 * @param pageNo diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java index dd6e8c9a2..4462f471d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java @@ -17,6 +17,7 @@ import org.apache.ibatis.annotations.Param; public interface CardValueRecordMapper extends BaseMapper { IPage selectCardRecord(@Param("page") Page page,@Param("cardValueRecord") CardValueRecordDTO cardValueRecord); + IPage selectFuleRecord(@Param("page") Page page,@Param("cardValueRecord") CardValueRecordDTO cardValueRecord); IPage selectAllRecord(@Param("page") Page page, @Param("cardValueRecord") CardValueRecordDTO cardValueRecord); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml index 2c655409d..3c3c72d27 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml @@ -28,6 +28,32 @@ ORDER BY createTime + +