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-12-03 13:44:47 +08:00
parent 46a9385621
commit ed293f8128
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,6 +122,9 @@ public class MkShopCouponRecord implements Serializable {
private LocalDateTime useEndTime; private LocalDateTime useEndTime;
@JSONField(format = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime useStartTime; private LocalDateTime useStartTime;
@Column(ignore = true)
private String couponName;
/** /**
* 有效期类型：fixed（固定时间），custom（自定义时间） * 有效期类型：fixed（固定时间），custom（自定义时间）
*/ */

3
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopCouponRecordServiceImpl.java
View File

@@ -519,11 +519,10 @@ public class MkShopCouponRecordServiceImpl extends ServiceImpl<MkShopCouponRecor
public MkShopCouponRecord assembleRecord(Long chatCouponId, ShopCoupon coupon) { public MkShopCouponRecord assembleRecord(Long chatCouponId, ShopCoupon coupon) {
MkShopCouponRecord record = new MkShopCouponRecord(); MkShopCouponRecord record = new MkShopCouponRecord();
record.setShopId(coupon.getShopId()); record.setShopId(coupon.getShopId());
record.setCouponName(coupon.getTitle());
record.setCouponId(coupon.getId()); record.setCouponId(coupon.getId());
record.setCouponSyncId(coupon.getSyncId()); record.setCouponSyncId(coupon.getSyncId());
record.setSourceId(chatCouponId); record.setSourceId(chatCouponId);
record.setSource("群聊发放"); record.setSource("群聊发放");
record.setStatus(0); record.setStatus(0);
record.setType(coupon.getCouponType()); record.setType(coupon.getCouponType());

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
View File

@@ -502,7 +502,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
} else { } else {
BigDecimal discount = BigDecimal.valueOf(100).subtract(BigDecimal.valueOf(shopUser.getDiscount())).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP); BigDecimal discount = BigDecimal.valueOf(100).subtract(BigDecimal.valueOf(shopUser.getDiscount())).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
BigDecimal discountAmount = newTotalAmount.multiply(discount); BigDecimal discountAmount = newTotalAmount.multiply(discount);
discountAmount = discountAmount.setScale(2, RoundingMode.HALF_DOWN); discountAmount = discountAmount.setScale(2, RoundingMode.HALF_UP);
if (discountAmount.compareTo(param.getVipDiscountAmount()) != 0) { if (discountAmount.compareTo(param.getVipDiscountAmount()) != 0) {
log.info("会员整单折扣金额不正确：传递为：{}，计算为：{}", param.getVipDiscountAmount(), discountAmount); log.info("会员整单折扣金额不正确：传递为：{}，计算为：{}", param.getVipDiscountAmount(), discountAmount);
throw new OrderValidateException("生成支付订单失败，会员整单折扣金额不正确"); throw new OrderValidateException("生成支付订单失败，会员整单折扣金额不正确");