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

原记录表作废

Browse Source
This commit is contained in:
wangw
2025-09-13 15:57:51 +08:00
parent 77ac277856
commit dca94cc848
15 changed files with 183 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopActivateCouponRecord.java
View File

@@ -1,118 +0,0 @@
package com.czg.account.entity;
import com.mybatisflex.annotation.Column;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.KeyType;
import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.io.Serial;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 活动商品赠送记录表 实体类。
*
* @author ww
* @since 2025-02-20
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Table("tb_shop_activate_coupon_record")
public class ShopActivateCouponRecord implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Id(keyType = KeyType.Auto)
private Long id;
/**
* 用户id shopUserId
*/
private Long shopUserId;
/**
* 卷Id (校验是否可用)
*/
private Long couponId;
/**
* 卷描述 满10减2/商品卷
*/
private String name;
/**
* 1-满减 2-商品
*/
private Integer type;
/**
* 商品id
*/
private Long proId;
/**
* 满多少金额
*/
private BigDecimal fullAmount;
/**
* 减多少金额
*/
private BigDecimal discountAmount;
/**
* 店铺id
*/
private Long shopId;
@Column(ignore = true)
private String shopName;
/**
* 来源活动id
*/
private Long sourceActId;
private Long sourceFlowId;
/**
* 可用开始时间
*/
private LocalDateTime useStartTime;
/**
* 可用结束时间
*/
private LocalDateTime useEndTime;
@Column(onInsertValue = "now()")
private LocalDateTime createTime;
@Column(onInsertValue = "now()", onUpdateValue = "now()")
private LocalDateTime updateTime;
private String couponJson;
/**
* invited 邀请
* activate 活动
*/
private String source;
/**
* 未使用 0
* 已使用 1
* 已过期 2
*/
private Integer status;
private Long targetId;
}

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

@@ -1,25 +0,0 @@
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.service.IService;
import java.util.List;
/**
* 活动商品赠送记录表 服务层。
*
* @author ww
* @since 2025-02-20
*/
public interface ShopActivateCouponRecordService extends IService<ShopActivateCouponRecord> {
List<CouponReceiveVo> queryReceive(QueryReceiveDto param);
List<ShopActivateCouponRecord> findByUser(List<Long> shopUserIds, Integer status);
List<UserCouponVo> queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type);
}

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

@@ -98,7 +98,9 @@ public class MkShopCouponRecordDTO implements Serializable {
* 过期时间
*/
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime expiredTime;
private LocalDateTime useEndTime;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime useStartTime;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;

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

@@ -106,7 +106,8 @@ public class MkShopCouponRecord implements Serializable {
/**
* 过期时间
*/
private LocalDateTime expiredTime;
private LocalDateTime useEndTime;
private LocalDateTime useStartTime;
@Column(onInsertValue = "now()", onUpdateValue = "now()")
private LocalDateTime updateTime;

12
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopCouponRecordService.java
View File

@@ -1,10 +1,15 @@
package com.czg.market.service;
import com.czg.account.dto.QueryReceiveDto;
import com.czg.account.vo.CouponReceiveVo;
import com.czg.account.vo.UserCouponVo;
import com.czg.market.dto.MkShopCouponRecordDTO;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import com.czg.market.entity.MkShopCouponRecord;
import java.util.List;
/**
* 优惠券发放记录表 服务层。
*
@@ -13,6 +18,13 @@ import com.czg.market.entity.MkShopCouponRecord;
*/
public interface MkShopCouponRecordService extends IService<MkShopCouponRecord> {
List<CouponReceiveVo> queryReceive(QueryReceiveDto param);
List<MkShopCouponRecord> findByUser(List<Long> shopUserIds, Integer status);
List<UserCouponVo> queryByVipIdAndShopId(Long shopId, Long shopUserId, Integer type);
/**
* 优惠券列表/已领取详情
* @param search 用户Id/昵称/手机号