diff --git a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java index 5234ccb..ac4d7c7 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java +++ b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java @@ -111,6 +111,24 @@ public class BeanConsumeController { return Result.error(e.toString()); }} + //筛选查询小黄车消费记录 + @PostMapping("/selectCartBy") + public Result selectCartBy(@RequestBody Page page){ + try { + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.error("页码数为空!"); + } + if (ObjectUtils.isEmpty(page.getPageSize())) { + return Result.error("页大小为空!"); + } else { + + return Result.success(beanConsumeService.selectCartBy(page.getPageNum(), page.getPageSize(), page.getBeanConsumeCart())); + } + } catch (Exception e) { + e.printStackTrace(); + return Result.error(e.toString()); + } + } //消费合计数 @PostMapping("sumConsumeGold") public BeanConsumeGold sumConsumeGold(@RequestBody Page page) { diff --git a/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCart.java b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCart.java new file mode 100644 index 0000000..d4ca76b --- /dev/null +++ b/src/main/java/com/example/demo/domain/vo/bean/BeanConsumeCart.java @@ -0,0 +1,12 @@ +package com.example.demo.domain.vo.bean; + +/** + * @program: gold-java + * @ClassName BeanConsumeCart + * @description: + * @author: Ethan + * @create: 2025−11-20 10:28 + * @Version 1.0 + **/ +public class BeanConsumeCart { +} diff --git a/src/main/java/com/example/demo/domain/vo/coin/Page.java b/src/main/java/com/example/demo/domain/vo/coin/Page.java index 840b1c2..f8cd7c1 100644 --- a/src/main/java/com/example/demo/domain/vo/coin/Page.java +++ b/src/main/java/com/example/demo/domain/vo/coin/Page.java @@ -36,6 +36,7 @@ public class Page { private BeanConsumeLive beanConsumeLive; //直播金豆消费 private BeanConsumeFan beanConsumeFan; //铁粉金豆消费 private BeanConsumeArticle beanConsumeArticle; //文章金豆消费 + private BeanConsumeCart beanConsumeCart; private BeanSystemRechargeInfo beanSystemRechargeInfo; //金豆充值信息 private BeanOnlineRechargeInfo beanOnlineRechargeInfo; //金豆充值信息 private BeanConsumeGold beanConsumeGold; //金豆消费合计数 diff --git a/src/main/java/com/example/demo/service/bean/BeanConsumeService.java b/src/main/java/com/example/demo/service/bean/BeanConsumeService.java index 3b4711c..96f0836 100644 --- a/src/main/java/com/example/demo/service/bean/BeanConsumeService.java +++ b/src/main/java/com/example/demo/service/bean/BeanConsumeService.java @@ -36,6 +36,6 @@ public interface BeanConsumeService { //获取直播频道 List getLiveChannel(); - - + //筛选查询小黄车消费 + Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCart beanConsumeCart); } diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java index 6441b35..5bc5375 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java @@ -201,6 +201,11 @@ public class BeanConsumeServiceImpl implements BeanConsumeService { public List getLiveChannel() { return liveMapper.getLiveChannel(); } + //筛选查询小黄车消费 + @Override + public Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCart beanConsumeCart) { + return null; + } } diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java index 0569083..d9fb396 100644 --- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java @@ -61,13 +61,13 @@ public class CashCollectionServiceImpl implements CashCollectionService { if (cashCollection.getJwcode() < 10000000 || cashCollection.getJwcode() > 99999999) { throw new IllegalArgumentException("精网号必须为8位"); } - if (cashCollection.getName() == null) { + if (cashCollection.getName() == null || cashCollection.getName().isEmpty()){ throw new IllegalArgumentException("客户姓名不能为空"); } - if (cashCollection.getActivity() == null) { + if (cashCollection.getActivity() == null || cashCollection.getActivity().isEmpty()) { throw new IllegalArgumentException("活动不能为空"); } - if (cashCollection.getGoodsName() == null) { + if (cashCollection.getGoodsName() == null|| cashCollection.getGoodsName().isEmpty()) { throw new IllegalArgumentException("商品名不能为空"); } if (cashCollection.getGoodsName().equals("金币充值")) { @@ -79,20 +79,20 @@ public class CashCollectionServiceImpl implements CashCollectionService { if (cashCollection.getGoodNum() == 0) { throw new IllegalArgumentException("产品数量不能为空"); } - if (cashCollection.getNumUnit() == null) { + if (cashCollection.getNumUnit() == null|| cashCollection.getNumUnit().isEmpty()) { throw new IllegalArgumentException("数量单位不能为空"); } } - if (cashCollection.getPaymentCurrency() == null) { + if (cashCollection.getPaymentCurrency() == null || cashCollection.getPaymentCurrency().isEmpty()) { throw new IllegalArgumentException("支付币种不能为空"); } if (cashCollection.getPaymentAmount() == null || cashCollection.getPaymentAmount().compareTo(BigDecimal.ZERO) == 0) { throw new IllegalArgumentException("支付金额不能为空"); } - if (cashCollection.getPayType() == null) { + if (cashCollection.getPayType() == null|| cashCollection.getPayType().isEmpty()) { throw new IllegalArgumentException("支付方式不能为空"); } - if (cashCollection.getReceivedMarket() == null) { + if (cashCollection.getReceivedMarket() == null||cashCollection.getReceivedMarket().isEmpty()) { throw new IllegalArgumentException("到账地区不能为空"); } if (cashCollection.getPayTime() == null) { diff --git a/src/main/resources/cashMapper/CashCollectionMapper.xml b/src/main/resources/cashMapper/CashCollectionMapper.xml index 2db20e8..db535c1 100644 --- a/src/main/resources/cashMapper/CashCollectionMapper.xml +++ b/src/main/resources/cashMapper/CashCollectionMapper.xml @@ -62,23 +62,14 @@ UPDATE cash_record_collection - handling_charge = #{cashRecordCollection.handlingCharge}, - - received_currency = #{cashRecordCollection.receivedCurrency}, - - + received_amount = #{cashRecordCollection.receivedAmount}, - received_time = #{cashRecordCollection.receivedTime}, - - payment_currency = #{cashRecordCollection.paymentCurrency}, - - - + payment_amount = #{cashRecordCollection.paymentAmount},