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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
wangw
2025-10-22 10:37:09 +08:00
parent c89673d4ea f210284292
commit 7e175d8c6d
11 changed files with 238 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
cash-common/cash-common-service/src/main/java/com/czg/market/dto/MkRedemptionDTO.java Normal file
View File

@@ -0,0 +1,42 @@
package com.czg.market.dto;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
/**
*
* @author ww
* @since 2025-09-12
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class MkRedemptionDTO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* recharge充值码 coupon券兑换码
*/
@NotBlank(message = "类型不为空")
private String type;
/**
* 券码
*/
@NotBlank(message = "券码不为空")
private String code;
/**
* 门店id
*/
@NotNull(message = "门店不为空")
private Long shopId;
}

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

@@ -1,6 +1,7 @@
package com.czg.market.service;
import com.czg.market.dto.MkCouponRedemptionConfigDTO;
import com.czg.market.dto.MkRedemptionDTO;
import com.czg.market.vo.MkCouponRedemptionCodeVO;
import com.czg.market.vo.MkCouponRedemptionConfigVO;
import com.mybatisflex.core.paginate.Page;
@@ -16,7 +17,7 @@ import jakarta.servlet.http.HttpServletResponse;
* @since 2025-10-22
*/
public interface MkCouponRedemptionConfigService extends IService<MkCouponRedemptionConfig> {
MkCouponRedemptionConfigVO detail(Long mainShopId);
MkCouponRedemptionConfigVO detail(Long mainShopId, Long id);
Boolean edit(Long shopId, MkCouponRedemptionConfigDTO dto);
@@ -27,4 +28,6 @@ public interface MkCouponRedemptionConfigService extends IService<MkCouponRedemp
Page<MkCouponRedemptionCodeVO> codeList(Long mainShopId, Long id, String code, Integer status);
void exportCodeList(Long mainShopId, Long redemptionId, String code, Integer status, HttpServletResponse response, HttpServletRequest request);
void exchange(long userId, MkRedemptionDTO dto);
}

3
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkEnableConfigService.java
View File

@@ -5,6 +5,7 @@ import com.czg.market.dto.MkEnableConfigDTO;
import com.czg.market.vo.MkEnableConfigVO;
import com.mybatisflex.core.service.IService;
import com.czg.market.entity.MkEnableConfig;
import jakarta.validation.constraints.NotNull;
/**
* 兑换码明细 服务层。
@@ -16,4 +17,6 @@ public interface MkEnableConfigService extends IService<MkEnableConfig> {
Boolean upEnable(Long mainShopId, Long shopId, MkEnableConfigDTO dto, TableValueConstant.EnableConfig.Type type);
MkEnableConfigVO detail(Long mainShopId, Long shopId, TableValueConstant.EnableConfig.Type type);
void checkEnable(Long mainShopId, @NotNull(message = "门店不为空") Long shopId, TableValueConstant.EnableConfig.Type type, boolean masterMange);
}

3
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkRechargeRedemptionConfigService.java
View File

@@ -1,6 +1,7 @@
package com.czg.market.service;
import com.czg.market.dto.MkRechargeRedemptionConfigDTO;
import com.czg.market.dto.MkRedemptionDTO;
import com.czg.market.vo.MkRechargeRedemptionCodeVO;
import com.czg.market.vo.MkRechargeRedemptionConfigVO;
import com.mybatisflex.core.paginate.Page;
@@ -28,4 +29,6 @@ public interface MkRechargeRedemptionConfigService extends IService<MkRechargeRe
Page<MkRechargeRedemptionCodeVO> codeList(Long mainShopId, Long id, String code, Integer status);
void exportCodeList(Long mainShopId, Long redemptionId, String code, Integer status, HttpServletResponse response, HttpServletRequest request);
void exchange(long userId, MkRedemptionDTO dto);
}

3
cash-common/cash-common-service/src/main/java/com/czg/market/vo/MkCouponRedemptionConfigVO.java
View File

@@ -1,5 +1,6 @@
package com.czg.market.vo;
import com.czg.market.dto.CouponInfoDTO;
import com.czg.market.entity.MkRechargeRedemptionConfig;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
@@ -32,7 +33,7 @@ public class MkCouponRedemptionConfigVO implements Serializable {
/**
* 赠送金额
*/
private List<CouponInfoVO> couponInfoList;
private List<CouponInfoDTO> couponInfoList;
/**
* 优惠券数量
*/