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
This commit is contained in:
Tankaikai
2025-02-18 14:51:21 +08:00
parent cc4616df01 f80683aef8
commit 78d7c32638
23 changed files with 475 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopActivateDTO.java
View File

@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
@@ -39,12 +40,12 @@ public class ShopActivateDTO implements Serializable {
* 充值金额
*/
@NotNull(message = "充值金额不能为空", groups = {InsertGroup.class, UpdateGroup.class})
private Integer amount;
private BigDecimal amount;
/**
* 赠送金额
*/
private Integer giftAmount;
private BigDecimal giftAmount;
/**
* 赠送积分

26
cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopCouponDTO.java
View File

@@ -1,17 +1,18 @@
package com.czg.account.dto;
import java.io.Serializable;
import java.math.BigDecimal;
import java.sql.Time;
import java.time.LocalDateTime;
import com.alibaba.fastjson2.annotation.JSONField;
import java.io.Serial;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.sql.Time;
import java.time.LocalDateTime;
/**
* 优惠券 实体类。
*
@@ -37,18 +38,12 @@ public class ShopCouponDTO implements Serializable {
*/
private Integer status;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
/**
* 名称(无意义)
*/
private String title;
private String shopId;
private Long shopId;
/**
* 已使用数量
@@ -139,4 +134,11 @@ public class ShopCouponDTO implements Serializable {
*/
private String editor;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}

52
cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopCouponProductDTO.java Normal file
View File

@@ -0,0 +1,52 @@
package com.czg.account.dto;
import com.alibaba.fastjson2.annotation.JSONField;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 活动赠送商品表 实体类。
*
* @author ww
* @since 2025-02-18
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class ShopCouponProductDTO implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
private Long id;
/**
* 活动Id
*/
private Long couponId;
/**
* 商品id
*/
private Long productId;
/**
* 数量
*/
private Integer num;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}

14
cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopActivate.java
View File

@@ -4,16 +4,16 @@ 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.time.LocalDateTime;
import java.io.Serial;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
/**
* 活动 实体类。
*
@@ -38,12 +38,12 @@ public class ShopActivate implements Serializable {
/**
* 充值金额
*/
private Integer amount;
private BigDecimal amount;
/**
* 赠送金额
*/
private Integer giftAmount;
private BigDecimal giftAmount;
/**
* 赠送积分

30
cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopCoupon.java
View File

@@ -1,22 +1,20 @@
package com.czg.account.entity;
import com.alibaba.fastjson2.annotation.JSONField;
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.sql.Time;
import java.time.LocalDateTime;
import java.io.Serial;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
import java.sql.Time;
import java.time.LocalDateTime;
/**
* 优惠券 实体类。
*
@@ -44,18 +42,12 @@ public class ShopCoupon implements Serializable {
*/
private Integer status;
@Column(onInsertValue = "now()")
private LocalDateTime createTime;
@Column(onInsertValue = "now()", onUpdateValue = "now()")
private LocalDateTime updateTime;
/**
* 名称(无意义)
*/
private String title;
private String shopId;
private Long shopId;
/**
* 已使用数量
@@ -80,7 +72,7 @@ public class ShopCoupon implements Serializable {
/**
* 有效天数
*/
private Integer validDays;
private Long validDays;
/**
* 隔多少天生效
@@ -142,4 +134,10 @@ public class ShopCoupon implements Serializable {
*/
private String editor;
@Column(onInsertValue = "now()")
private LocalDateTime createTime;
@Column(onInsertValue = "now()", onUpdateValue = "now()")
private LocalDateTime updateTime;
}

56
cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopCouponProduct.java Normal file
View File

@@ -0,0 +1,56 @@
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 lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serial;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 活动赠送商品表 实体类。
*
* @author ww
* @since 2025-02-18
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table("tb_shop_coupon_product")
public class ShopCouponProduct implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
@Id(keyType = KeyType.Auto)
private Long id;
/**
* 活动Id
*/
private Long couponId;
/**
* 商品id
*/
private Long productId;
/**
* 数量
*/
private Integer num;
@Column(onInsertValue = "now()")
private LocalDateTime createTime;
@Column(onInsertValue = "now()", onUpdateValue = "now()")
private LocalDateTime updateTime;
}

9
cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateService.java
View File

@@ -4,6 +4,7 @@ import com.czg.account.dto.ShopActivateDTO;
import com.czg.account.entity.ShopActivate;
import com.mybatisflex.core.service.IService;
import java.math.BigDecimal;
import java.util.List;
/**
@@ -20,5 +21,13 @@ public interface ShopActivateService extends IService<ShopActivate> {
Boolean edit(ShopActivateDTO activateDTO);
/**
* @param memAmount 充值金额
* @param relationId 关联Id
* 霸王餐时 订单id
* 充值奖励 的关联id 是tb_shop_user_flow的充值 记录id
* 支付/退款 tb_order_payment.id
*/
void giveActivate(Long shopId, Long vipId, BigDecimal memAmount, Long relationId);
}

14
cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponProductService.java Normal file
View File

@@ -0,0 +1,14 @@
package com.czg.account.service;
import com.czg.account.entity.ShopCouponProduct;
import com.mybatisflex.core.service.IService;
/**
* 活动赠送商品表 服务层。
*
* @author ww
* @since 2025-02-18
*/
public interface ShopCouponProductService extends IService<ShopCouponProduct> {
}

5
cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java
View File

@@ -17,7 +17,10 @@ public interface ShopUserService extends IService<ShopUser> {
Boolean updateInfo(Long shopId, ShopUserEditDTO shopUserEditDTO);
Boolean updateMoney(Long shopId, ShopUserMoneyEditDTO shopUserEditDTO);
/**
* 返回流水Id
*/
Long updateMoney(Long shopId, ShopUserMoneyEditDTO shopUserEditDTO);
ShopUserSummaryDTO getSummary(Long shopId, Integer isVip);

20
cash-common/cash-common-service/src/main/java/com/czg/account/vo/CouponProductVo.java Normal file
View File

@@ -0,0 +1,20 @@
package com.czg.account.vo;
import lombok.Data;
/**
* @author ww
* @description
*/
@Data
public class CouponProductVo {
/**
* 商品id
*/
private Long productId;
/**
* 数量
*/
private Integer num;
}