czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

助力记录接口

Browse Source
This commit is contained in:
gong
2025-12-20 10:51:34 +08:00
parent bd71495aad
commit 631084b6e2
18 changed files with 55 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-api/market-server/src/main/java/com/czg/controller/admin/ADiscountActivityController.java
View File

@@ -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<Page<MkDiscountActivityDTO>> getActivityPage(TimeQueryParam param) {
public CzgResult<Page<MkDiscountActivityDTO>> getActivityPage(PageQueryParam param) {
Page<MkDiscountActivityDTO> data = discountActivityService.getActivityPage(param, StpKit.USER.getShopId());
return CzgResult.success(data);
}

4
cash-api/market-server/src/main/java/com/czg/controller/admin/ALimitTimeDiscountController.java
View File

@@ -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<Page<MkLimitTimeDiscountDTO>> getLimitTimeDiscountPage(TimeQueryParam param) {
public CzgResult<Page<MkLimitTimeDiscountDTO>> getLimitTimeDiscountPage(PageQueryParam param) {
Page<MkLimitTimeDiscountDTO> data = limitTimeDiscountService.getLimitTimeDiscountPage(param, StpKit.USER.getShopId());
return CzgResult.success(data);
}

15
cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java
View File

@@ -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<PpPackageOrderDTO> getOrderDetail(Long orderId) {
return CzgResult.success(ppPackageOrderService.getOrderDetailById(orderId, StpKit.USER.getLoginIdAsLong()));
}
/**
* 获取助力列表
*/
@GetMapping("/help/page")
public CzgResult<Page<PpHelpRecordDTO>> getHelpList(PageQueryParam reqVo) {
return CzgResult.success(ppHelpRecordService.helpPage(reqVo));
}
}

6
cash-common/cash-common-service/src/main/java/com/czg/TimeQueryParam.java → cash-common/cash-common-service/src/main/java/com/czg/PageQueryParam.java
View File

@@ -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);
}

4
cash-common/cash-common-service/src/main/java/com/czg/market/dto/GbWareQueryParamDTO.java
View File

@@ -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 {
/**

4
cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkDistributionUserDTO.java
View File

@@ -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;

4
cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkPointsGoodsRecordQueryDTO.java
View File

@@ -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;

4
cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsMoneyDetailDto.java
View File

@@ -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;

4
cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java
View File

@@ -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;

4
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDiscountActivityService.java
View File

@@ -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<MkDiscountActivity> {
Page<MkDiscountActivityDTO> getActivityPage(TimeQueryParam param, Long shopId);
Page<MkDiscountActivityDTO> getActivityPage(PageQueryParam param, Long shopId);
MkDiscountActivityDTO checkDiscountAct(Long discountActId, boolean couponShare, boolean vipShare, boolean limitRateShare, boolean pointsShare);

4
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkLimitTimeDiscountService.java
View File

@@ -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<MkLimitTimeDiscount> {
Page<MkLimitTimeDiscountDTO> getLimitTimeDiscountPage(TimeQueryParam param, Long shopId);
Page<MkLimitTimeDiscountDTO> getLimitTimeDiscountPage(PageQueryParam param, Long shopId);
MkLimitTimeDiscount getLimitTimeDiscountByShopId(Long shopId);

5
cash-common/cash-common-service/src/main/java/com/czg/market/service/PpHelpRecordService.java
View File

@@ -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<PpHelpRecord> {
boolean help(Long userId, Long orderId);
void removeHelpRecord(Long orderId);
Page<PpHelpRecordDTO> helpPage(PageQueryParam reqVo);
}

1
cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopMoneyDetailService.java
View File

@@ -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;

4
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDiscountActivityServiceImpl.java
View File

@@ -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<MkDiscountActivit
private ShopInfoService shopInfoService;
@Override
public Page<MkDiscountActivityDTO> getActivityPage(TimeQueryParam param, Long shopId) {
public Page<MkDiscountActivityDTO> getActivityPage(PageQueryParam param, Long shopId) {
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq(MkDiscountActivity::getShopId, shopId)
.eq(MkDiscountActivity::getIsDel, 0)

4
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkLimitTimeDiscountServiceImpl.java
View File

@@ -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<MkLimitTimeDisco
private ProductService productService;
@Override
public Page<MkLimitTimeDiscountDTO> getLimitTimeDiscountPage(TimeQueryParam param, Long shopId) {
public Page<MkLimitTimeDiscountDTO> getLimitTimeDiscountPage(PageQueryParam param, Long shopId) {
Long mainShopId = shopInfoService.getMainIdByShopId(shopId);
QueryWrapper queryWrapper = new QueryWrapper();
queryWrapper.eq(MkLimitTimeDiscount::getIsDel, 0)

5
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkProductSmartSuggestServiceImpl.java
View File

@@ -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;

9
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpHelpRecordServiceImpl.java
View File

@@ -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<PpHelpRecordMapper, PpH
public void removeHelpRecord(Long orderId) {
remove(QueryWrapper.create().eq(PpHelpRecord::getOrderId, orderId));
}
@Override
public Page<PpHelpRecordDTO> helpPage(PageQueryParam reqVo) {
QueryWrapper wrapper = QueryWrapper.create().eq(PpHelpRecord::getOrderId, reqVo.getRecordId());
return pageAs(new Page<>(reqVo.getPage(), reqVo.getSize()), wrapper, PpHelpRecordDTO.class);
}
}

2
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopMoneyDetailServiceImpl.java
View File

@@ -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;
/**
* 短信余额明细 服务层实现。