From 631084b6e204808b21a9826d43139929c264949d Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Sat, 20 Dec 2025 10:51:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A9=E5=8A=9B=E8=AE=B0=E5=BD=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/ADiscountActivityController.java | 4 ++-- .../admin/ALimitTimeDiscountController.java | 4 ++-- .../czg/controller/user/UPpPackageController.java | 15 ++++++++++++++- .../{TimeQueryParam.java => PageQueryParam.java} | 6 +++++- .../com/czg/market/dto/GbWareQueryParamDTO.java | 4 ++-- .../com/czg/market/dto/MkDistributionUserDTO.java | 4 ++-- .../market/dto/MkPointsGoodsRecordQueryDTO.java | 4 ++-- .../com/czg/market/dto/SmsMoneyDetailDto.java | 4 ++-- .../com/czg/market/dto/SmsTemplateQueryDTO.java | 4 ++-- .../market/service/MkDiscountActivityService.java | 4 ++-- .../service/MkLimitTimeDiscountService.java | 4 ++-- .../czg/market/service/PpHelpRecordService.java | 5 +++++ .../market/service/SmsShopMoneyDetailService.java | 1 - .../impl/MkDiscountActivityServiceImpl.java | 4 ++-- .../impl/MkLimitTimeDiscountServiceImpl.java | 4 ++-- .../impl/MkProductSmartSuggestServiceImpl.java | 5 ----- .../service/impl/PpHelpRecordServiceImpl.java | 9 +++++++++ .../impl/SmsShopMoneyDetailServiceImpl.java | 2 -- 18 files changed, 55 insertions(+), 32 deletions(-) rename cash-common/cash-common-service/src/main/java/com/czg/{TimeQueryParam.java => PageQueryParam.java} (83%) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/ADiscountActivityController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/ADiscountActivityController.java index f65ca5677..5bc47bbf9 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/ADiscountActivityController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/ADiscountActivityController.java @@ -1,6 +1,6 @@ package com.czg.controller.admin; -import com.czg.TimeQueryParam; +import com.czg.PageQueryParam; import com.czg.log.annotation.OperationLog; import com.czg.market.dto.MkDiscountActivityDTO; import com.czg.market.service.MkDiscountActivityService; @@ -31,7 +31,7 @@ public class ADiscountActivityController { * 分页 */ @GetMapping("page") - public CzgResult> getActivityPage(TimeQueryParam param) { + public CzgResult> getActivityPage(PageQueryParam param) { Page data = discountActivityService.getActivityPage(param, StpKit.USER.getShopId()); return CzgResult.success(data); } diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/ALimitTimeDiscountController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/ALimitTimeDiscountController.java index eb74a9991..80f37f906 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/ALimitTimeDiscountController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/ALimitTimeDiscountController.java @@ -1,6 +1,6 @@ package com.czg.controller.admin; -import com.czg.TimeQueryParam; +import com.czg.PageQueryParam; import com.czg.log.annotation.OperationLog; import com.czg.market.dto.MkLimitTimeDiscountDTO; import com.czg.market.entity.MkLimitTimeDiscount; @@ -31,7 +31,7 @@ public class ALimitTimeDiscountController { * 限时折扣-分页 */ @GetMapping("page") - public CzgResult> getLimitTimeDiscountPage(TimeQueryParam param) { + public CzgResult> getLimitTimeDiscountPage(PageQueryParam param) { Page data = limitTimeDiscountService.getLimitTimeDiscountPage(param, StpKit.USER.getShopId()); return CzgResult.success(data); } diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java index 01b978a22..048d687c9 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java @@ -1,8 +1,10 @@ package com.czg.controller.user; import com.alibaba.fastjson2.JSONObject; +import com.czg.PageQueryParam; +import com.czg.market.dto.PpHelpRecordDTO; import com.czg.market.dto.PpPackageOrderDTO; -import com.czg.market.entity.PpPackage; +import com.czg.market.service.PpHelpRecordService; import com.czg.market.service.PpPackageOrderService; import com.czg.market.service.PpPackageService; import com.czg.market.vo.PpOrderListVO; @@ -32,6 +34,9 @@ public class UPpPackageController { @Resource private PpPackageOrderService ppPackageOrderService; + @Resource + private PpHelpRecordService ppHelpRecordService; + /** * 创建套餐推广订单 * 参数: {"packageId": 123, "shopId": 123} @@ -93,4 +98,12 @@ public class UPpPackageController { public CzgResult getOrderDetail(Long orderId) { return CzgResult.success(ppPackageOrderService.getOrderDetailById(orderId, StpKit.USER.getLoginIdAsLong())); } + + /** + * 获取助力列表 + */ + @GetMapping("/help/page") + public CzgResult> getHelpList(PageQueryParam reqVo) { + return CzgResult.success(ppHelpRecordService.helpPage(reqVo)); + } } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/TimeQueryParam.java b/cash-common/cash-common-service/src/main/java/com/czg/PageQueryParam.java similarity index 83% rename from cash-common/cash-common-service/src/main/java/com/czg/TimeQueryParam.java rename to cash-common/cash-common-service/src/main/java/com/czg/PageQueryParam.java index 9f0fd68ad..447dd1e2f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/TimeQueryParam.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/PageQueryParam.java @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data -public class TimeQueryParam extends BaseQueryParam { +public class PageQueryParam extends BaseQueryParam { /** * 开始时间 yyyy-MM-dd HH:mm:ss */ @@ -20,6 +20,10 @@ public class TimeQueryParam extends BaseQueryParam { */ private String endTime; + private Long recordId; + + private Long shopId; + public String getStartTime() { return CzgStrUtils.getStrOrNull(startTime); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/GbWareQueryParamDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/GbWareQueryParamDTO.java index eb756c5bc..ddd425efa 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/GbWareQueryParamDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/GbWareQueryParamDTO.java @@ -1,6 +1,6 @@ package com.czg.market.dto; -import com.czg.TimeQueryParam; +import com.czg.PageQueryParam; import com.czg.utils.CzgStrUtils; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data -public class GbWareQueryParamDTO extends TimeQueryParam { +public class GbWareQueryParamDTO extends PageQueryParam { /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java index 1e94e896f..7e15232e0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java @@ -1,7 +1,7 @@ package com.czg.market.dto; -import com.czg.TimeQueryParam; +import com.czg.PageQueryParam; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -24,7 +24,7 @@ import java.time.LocalDateTime; @NoArgsConstructor @AllArgsConstructor @Accessors(chain = true) -public class MkDistributionUserDTO extends TimeQueryParam implements Serializable { +public class MkDistributionUserDTO extends PageQueryParam implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordQueryDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordQueryDTO.java index 5b68211ea..10fd585eb 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordQueryDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordQueryDTO.java @@ -1,7 +1,7 @@ package com.czg.market.dto; -import com.czg.TimeQueryParam; +import com.czg.PageQueryParam; import com.czg.utils.CzgStrUtils; import lombok.Data; import lombok.EqualsAndHashCode; @@ -17,7 +17,7 @@ import java.io.Serializable; */ @EqualsAndHashCode(callSuper = true) @Data -public class MkPointsGoodsRecordQueryDTO extends TimeQueryParam implements Serializable { +public class MkPointsGoodsRecordQueryDTO extends PageQueryParam implements Serializable { @Serial private static final long serialVersionUID = 1L; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java index c89310ddd..9920b2b70 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java @@ -1,6 +1,6 @@ package com.czg.market.dto; -import com.czg.TimeQueryParam; +import com.czg.PageQueryParam; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,7 +12,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data -public class SmsMoneyDetailDto extends TimeQueryParam { +public class SmsMoneyDetailDto extends PageQueryParam { // 1 充值 2 扣款 private Integer type; private Long shopId; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java index 09be716f0..39375957a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java @@ -1,6 +1,6 @@ package com.czg.market.dto; -import com.czg.TimeQueryParam; +import com.czg.PageQueryParam; import lombok.Data; import lombok.EqualsAndHashCode; @@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data -public class SmsTemplateQueryDTO extends TimeQueryParam { +public class SmsTemplateQueryDTO extends PageQueryParam { private Integer status; private Integer shopUse; private Integer shopId; diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDiscountActivityService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDiscountActivityService.java index 5bec27cb5..5cc2f4705 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDiscountActivityService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDiscountActivityService.java @@ -1,6 +1,6 @@ package com.czg.market.service; -import com.czg.TimeQueryParam; +import com.czg.PageQueryParam; import com.czg.market.dto.MkDiscountActivityDTO; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; @@ -13,7 +13,7 @@ import com.czg.market.entity.MkDiscountActivity; * @since 2025-10-13 */ public interface MkDiscountActivityService extends IService { - Page getActivityPage(TimeQueryParam param, Long shopId); + Page getActivityPage(PageQueryParam param, Long shopId); MkDiscountActivityDTO checkDiscountAct(Long discountActId, boolean couponShare, boolean vipShare, boolean limitRateShare, boolean pointsShare); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkLimitTimeDiscountService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkLimitTimeDiscountService.java index bd4328c8b..ec4c14529 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkLimitTimeDiscountService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkLimitTimeDiscountService.java @@ -1,6 +1,6 @@ package com.czg.market.service; -import com.czg.TimeQueryParam; +import com.czg.PageQueryParam; import com.czg.market.dto.MkLimitTimeDiscountDTO; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; @@ -13,7 +13,7 @@ import com.czg.market.entity.MkLimitTimeDiscount; * @since 2025-10-21 */ public interface MkLimitTimeDiscountService extends IService { - Page getLimitTimeDiscountPage(TimeQueryParam param, Long shopId); + Page getLimitTimeDiscountPage(PageQueryParam param, Long shopId); MkLimitTimeDiscount getLimitTimeDiscountByShopId(Long shopId); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpHelpRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpHelpRecordService.java index a5bf308cd..84ef8f07d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpHelpRecordService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/PpHelpRecordService.java @@ -1,5 +1,8 @@ package com.czg.market.service; +import com.czg.PageQueryParam; +import com.czg.market.dto.PpHelpRecordDTO; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import com.czg.market.entity.PpHelpRecord; @@ -16,4 +19,6 @@ public interface PpHelpRecordService extends IService { boolean help(Long userId, Long orderId); void removeHelpRecord(Long orderId); + + Page helpPage(PageQueryParam reqVo); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopMoneyDetailService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopMoneyDetailService.java index ad9dbd5b8..e8804d1a0 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopMoneyDetailService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopMoneyDetailService.java @@ -1,6 +1,5 @@ package com.czg.market.service; -import com.czg.TimeQueryParam; import com.czg.market.dto.SmsMoneyDetailDto; import com.czg.market.dto.SmsShopMoneyDetailDTO; import com.czg.market.entity.SmsShopMoneyDetail; diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDiscountActivityServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDiscountActivityServiceImpl.java index e543b581b..099722dd4 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDiscountActivityServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDiscountActivityServiceImpl.java @@ -2,7 +2,7 @@ package com.czg.service.market.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import com.czg.TimeQueryParam; +import com.czg.PageQueryParam; import com.czg.account.entity.ShopInfo; import com.czg.account.service.ShopInfoService; import com.czg.exception.CzgException; @@ -42,7 +42,7 @@ public class MkDiscountActivityServiceImpl extends ServiceImpl getActivityPage(TimeQueryParam param, Long shopId) { + public Page getActivityPage(PageQueryParam param, Long shopId) { QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq(MkDiscountActivity::getShopId, shopId) .eq(MkDiscountActivity::getIsDel, 0) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java index 80a744662..8e2f2486d 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java @@ -3,7 +3,7 @@ package com.czg.service.market.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.czg.TimeQueryParam; +import com.czg.PageQueryParam; import com.czg.account.service.ShopInfoService; import com.czg.exception.CzgException; import com.czg.market.dto.MkLimitTimeDiscountDTO; @@ -42,7 +42,7 @@ public class MkLimitTimeDiscountServiceImpl extends ServiceImpl getLimitTimeDiscountPage(TimeQueryParam param, Long shopId) { + public Page getLimitTimeDiscountPage(PageQueryParam param, Long shopId) { Long mainShopId = shopInfoService.getMainIdByShopId(shopId); QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq(MkLimitTimeDiscount::getIsDel, 0) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkProductSmartSuggestServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkProductSmartSuggestServiceImpl.java index 097ffc3c1..d985880cf 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkProductSmartSuggestServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkProductSmartSuggestServiceImpl.java @@ -2,12 +2,9 @@ package com.czg.service.market.service.impl; import cn.hutool.core.bean.BeanUtil; import com.czg.BaseQueryParam; -import com.czg.TimeQueryParam; import com.czg.account.entity.ShopInfo; import com.czg.account.service.ShopInfoService; import com.czg.market.dto.MkProductSmartSuggestDTO; -import com.czg.market.dto.MkProductSmartSuggestDTO; -import com.czg.market.entity.MkLimitTimeDiscount; import com.czg.market.entity.MkProductSmartSuggest; import com.czg.utils.AssertUtil; import com.czg.utils.CzgStrUtils; @@ -15,10 +12,8 @@ import com.czg.utils.PageUtil; import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; -import com.czg.market.entity.MkProductSmartSuggest; import com.czg.market.service.MkProductSmartSuggestService; import com.czg.service.market.mapper.MkProductSmartSuggestMapper; -import org.apache.catalina.LifecycleState; import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.stereotype.Service; diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpHelpRecordServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpHelpRecordServiceImpl.java index b5ac81c8e..21f8360e5 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpHelpRecordServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpHelpRecordServiceImpl.java @@ -1,11 +1,14 @@ package com.czg.service.market.service.impl; +import com.czg.PageQueryParam; import com.czg.account.dto.user.userinfo.UserInfoDTO; import com.czg.account.service.UserInfoService; import com.czg.exception.CzgException; +import com.czg.market.dto.PpHelpRecordDTO; import com.czg.market.entity.PpHelpRecord; import com.czg.market.service.PpHelpRecordService; import com.czg.service.market.mapper.PpHelpRecordMapper; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import org.apache.dubbo.config.annotation.DubboReference; @@ -51,4 +54,10 @@ public class PpHelpRecordServiceImpl extends ServiceImpl helpPage(PageQueryParam reqVo) { + QueryWrapper wrapper = QueryWrapper.create().eq(PpHelpRecord::getOrderId, reqVo.getRecordId()); + return pageAs(new Page<>(reqVo.getPage(), reqVo.getSize()), wrapper, PpHelpRecordDTO.class); + } } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopMoneyDetailServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopMoneyDetailServiceImpl.java index 746579349..a62295143 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopMoneyDetailServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopMoneyDetailServiceImpl.java @@ -1,6 +1,5 @@ package com.czg.service.market.service.impl; -import com.czg.TimeQueryParam; import com.czg.market.dto.SmsMoneyDetailDto; import com.czg.market.dto.SmsShopMoneyDetailDTO; import com.czg.market.entity.SmsShopMoneyDetail; @@ -14,7 +13,6 @@ import com.mybatisflex.spring.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.math.BigInteger; /** * 短信余额明细 服务层实现。