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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	cash-api/order-server/src/main/resources/application.yml
This commit is contained in:
Tankaikai
2025-02-27 19:02:20 +08:00
parent 8cbfbe265f 9f035cd1fa
commit ac7f784861
15 changed files with 116 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-common/cash-common-service/src/main/java/com/czg/account/entity/MerchantRegister.java
View File

@@ -41,7 +41,7 @@ public class MerchantRegister implements Serializable {
/**
* 店铺id
*/
private String shopId;
private Long shopId;
/**
* 激活码金额

7
cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateCouponRecordService.java
View File

@@ -1,11 +1,10 @@
package com.czg.account.service;
import com.czg.account.dto.QueryReceiveDto;
import com.czg.account.entity.ShopActivateCouponRecord;
import com.czg.account.vo.CouponReceiveVo;
import com.czg.account.vo.UserCouponVo;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import com.czg.account.entity.ShopActivateCouponRecord;
import java.util.List;
@@ -18,9 +17,9 @@ import java.util.List;
public interface ShopActivateCouponRecordService extends IService<ShopActivateCouponRecord> {
Page<CouponReceiveVo> queryReceive(Page<CouponReceiveVo> page, QueryReceiveDto param);
List<CouponReceiveVo> queryReceive(QueryReceiveDto param);
Page<ShopActivateCouponRecord> findByUser(Page<ShopActivateCouponRecord> page, List<Long> shopUserIds, Integer status);
List<ShopActivateCouponRecord> findByUser(List<Long> shopUserIds, Integer status);
List<UserCouponVo> queryByVipIdAndShopId(Long shopId, Long shopUserId);
}