czg_team/wx-cashier-service
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:
Tankaikai
2024-11-05 15:40:24 +08:00
parent 438f4c333e 306f34a30e
commit b2ced9cd10
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/service/CartService.java
View File

@@ -1055,7 +1055,9 @@ public class CartService {
priceDTO.setPackAmount(priceDTO.getPackAmount().add(cashierCart.getPackFee())); priceDTO.setPackAmount(priceDTO.getPackAmount().add(cashierCart.getPackFee()));
} }
if (!"return".equals(cashierCart.getStatus())) {
priceDTO.setOriginAmount(priceDTO.getOriginAmount().add(cashierCart.getTotalAmount())); priceDTO.setOriginAmount(priceDTO.getOriginAmount().add(cashierCart.getTotalAmount()));
}
TbProductSku productSku = productSkuMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getSkuId())); TbProductSku productSku = productSkuMapper.selectByPrimaryKey(Integer.valueOf(cashierCart.getSkuId()));
TbOrderDetail orderDetail = null; TbOrderDetail orderDetail = null;

3
src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java
View File

@@ -460,6 +460,9 @@ public class PayService {
} }
shouldPayAmount = shouldPayAmount.subtract(userCouponVo.getDiscountAmount()); shouldPayAmount = shouldPayAmount.subtract(userCouponVo.getDiscountAmount());
if (shouldPayAmount.compareTo(BigDecimal.ZERO) < 0) {
shouldPayAmount = new BigDecimal("0.01");
}
TbShopCoupon tbShopCoupons = mpShopCouponMapper.selectById(userCouponVo.getCouponId()); TbShopCoupon tbShopCoupons = mpShopCouponMapper.selectById(userCouponVo.getCouponId());
if (tbShopCoupons == null) { if (tbShopCoupons == null) {