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

Merge branch 'dev' into prod

Browse Source
This commit is contained in:
wangw
2025-11-13 18:13:06 +08:00
parent cacb9beb59 5e3440cddf
commit 1cab66ad99
48 changed files with 234 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,7 @@
package com.czg.market.service;
import com.czg.exception.ApiNotPrintException;
import com.czg.exception.CzgException;
import com.czg.market.dto.MkConsumeCashbackDTO;
import com.czg.market.dto.MkConsumeDiscountDTO;
import com.czg.market.vo.MkConsumeCashbackVO;
import com.mybatisflex.core.service.IService;
import com.czg.market.entity.MkConsumeCashback;
@@ -18,7 +17,7 @@ import java.math.BigDecimal;
public interface MkConsumeCashbackService extends IService<MkConsumeCashback> {
MkConsumeCashbackVO detail(Long shopId);
Boolean edit(Long shopId, MkConsumeCashbackDTO consumeDiscountDTO) throws ApiNotPrintException;
Boolean edit(Long shopId, MkConsumeCashbackDTO consumeDiscountDTO) throws CzgException;
/**
* 消费返现

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

@@ -1,6 +1,6 @@
package com.czg.market.service;
import com.czg.exception.ApiNotPrintException;
import com.czg.exception.CzgException;
import com.czg.market.dto.MkConsumeDiscountDTO;
import com.czg.market.vo.MkConsumeDiscountVO;
import com.mybatisflex.core.service.IService;
@@ -16,5 +16,5 @@ public interface MkConsumeDiscountService extends IService<MkConsumeDiscount> {
MkConsumeDiscountVO detail(Long shopId);
Boolean edit(Long shopId, MkConsumeDiscountDTO consumeDiscountDTO) throws ApiNotPrintException;
Boolean edit(Long shopId, MkConsumeDiscountDTO consumeDiscountDTO) throws CzgException;
}

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

@@ -2,7 +2,7 @@ package com.czg.market.service;
import com.czg.account.entity.ShopUser;
import com.czg.constant.TableValueConstant;
import com.czg.exception.ApiNotPrintException;
import com.czg.exception.CzgException;
import com.czg.market.dto.MemberConfigDTO;
import com.czg.market.dto.MemberLevelDTO;
import com.czg.market.vo.*;
@@ -26,7 +26,7 @@ public interface TbMemberConfigService extends IService<TbMemberConfig> {
Boolean edit(Long shopId, MemberConfigDTO memberDTO);
Boolean addLevel(Long shopId, MemberLevelDTO levelDTO) throws ApiNotPrintException;
Boolean addLevel(Long shopId, MemberLevelDTO levelDTO) throws CzgException;
Boolean editLevel(Long shopId, MemberLevelDTO levelDTO);