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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2025-12-04 09:50:36 +08:00
parent d388b75c8a 31564b3012
commit 975989f6cd
11 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ChatCouponServiceImpl.java
View File

@@ -82,10 +82,10 @@ public class ChatCouponServiceImpl extends ServiceImpl<ChatCouponMapper, ChatCou
* 失效
*/
@Override
public void expiredChatCoupon(Long shopId, Long id) {
public boolean expiredChatCoupon(Long shopId, Long id) {
ChatCoupon coupon = new ChatCoupon();
coupon.setStatus(3);
update(coupon, QueryWrapper.create()
return update(coupon, QueryWrapper.create()
.eq(ChatCoupon::getId, id)
.eq(ChatCoupon::getShopId, shopId)
);

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) {
MkShopCouponRecord record = new MkShopCouponRecord();
record.setShopId(coupon.getShopId());
record.setCouponName(coupon.getTitle());
record.setCouponId(coupon.getId());
record.setCouponSyncId(coupon.getSyncId());
record.setSourceId(chatCouponId);
record.setSource("群聊发放");
record.setStatus(0);
record.setType(coupon.getCouponType());

5
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/ShopCouponServiceImpl.java
View File

@@ -339,11 +339,10 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
@Override
@Async
public Boolean use(List<Long> ids, Long shopUserId, Long orderId) {
public void use(List<Long> ids, Long shopUserId, Long orderId) {
List<MkShopCouponRecord> records = recordService.listByIds(ids);
if (records.isEmpty()) {
log.error("优惠券使用失败，订单Id:{}", orderId);
return false;
}
Map<Long, Long> chatCouponIdCountMap = records.stream()
.filter(record -> "群聊发放".equals(record.getSource()))
@@ -389,7 +388,7 @@ public class ShopCouponServiceImpl extends ServiceImpl<ShopCouponMapper, ShopCou
}
update(coupon1, recordQueryWrapper);
});
return recordService.updateChain()
recordService.updateChain()
.set(MkShopCouponRecord::getStatus, 1)
.set(MkShopCouponRecord::getTargetId, orderId)
.set(MkShopCouponRecord::getUseTime, LocalDateTime.now())

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

@@ -500,9 +500,9 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
if (param.getVipDiscountAmount().compareTo(BigDecimal.ZERO) <= 0) {
param.setVipDiscountAmount(BigDecimal.ZERO);
} 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.DOWN);
BigDecimal discountAmount = newTotalAmount.multiply(discount);
discountAmount = discountAmount.setScale(2, RoundingMode.HALF_DOWN);
discountAmount = discountAmount.setScale(2, RoundingMode.DOWN);
if (discountAmount.compareTo(param.getVipDiscountAmount()) != 0) {
log.info("会员整单折扣金额不正确：传递为：{}，计算为：{}", param.getVipDiscountAmount(), discountAmount);
throw new OrderValidateException("生成支付订单失败，会员整单折扣金额不正确");

2
cash-service/order-service/src/main/resources/mapper/ShopProdStatisticMapper.xml
View File

@@ -96,7 +96,7 @@
sum(statistic.refund_amount) AS refundAmount
FROM
tb_shop_prod_statistic statistic
INNER JOIN tb_product prod ON tb_shop_prod_statistic.prod_id = prod.id
INNER JOIN tb_product prod ON statistic.prod_id = prod.id
WHERE
statistic.shop_id = #{shopId}
AND statistic.create_day = #{day}