diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java index 710baf5..660d4e4 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java @@ -246,7 +246,7 @@ public class PayService { orderInfo.setPayAmount(ObjectUtil.isEmpty(payAmount) ? orderInfo.getOrderAmount() : payAmount); - orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount) ? BigDecimal.ZERO : discountAmount); + orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount) ? null : discountAmount); orderInfo.setDiscountRatio(ObjectUtil.isNotEmpty(payAmount) ? payAmount.divide(orderInfo.getOrderAmount(), 2, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_DOWN) : null); orderInfo.setPayType(qpay); orderInfo.setUpdatedAt(System.currentTimeMillis()); @@ -592,7 +592,7 @@ public class PayService { orderInfo.setPayAmount(ObjectUtil.isEmpty(payAmount) ? orderInfo.getOrderAmount() : payAmount); - orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount) ? BigDecimal.ZERO : discountAmount); + orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount) ? null : discountAmount); orderInfo.setDiscountRatio(ObjectUtil.isNotEmpty(payAmount) ? payAmount.divide(orderInfo.getOrderAmount(), 2, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_DOWN) : null); orderInfo.setStaffId(ObjectUtil.isEmpty(staff) ? null : staff.getId()); orderInfo.setUserId(user.getUserId()); @@ -716,7 +716,7 @@ public class PayService { tbShopUserFlowMapper.insert(flow); orderInfo.setPayAmount(ObjectUtil.isEmpty(payAmount) ? orderInfo.getOrderAmount() : payAmount); - orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount) ? BigDecimal.ZERO : discountAmount); + orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount) ? null : discountAmount); orderInfo.setDiscountRatio(ObjectUtil.isNotEmpty(payAmount) ? payAmount.divide(orderInfo.getOrderAmount(), 2, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_DOWN) : null); orderInfo.setStaffId(ObjectUtil.isEmpty(staff) ? null : staff.getId()); orderInfo.setMemberId(user.getUserId()); @@ -897,7 +897,7 @@ public class PayService { orderInfo.setPayAmount(ObjectUtil.isEmpty(payAmount) ? orderInfo.getOrderAmount() : payAmount); - orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount) ? BigDecimal.ZERO : discountAmount); + orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount) ? null : discountAmount); orderInfo.setStaffId(ObjectUtil.isEmpty(staff) ? null : staff.getId()); orderInfo.setDiscountRatio(ObjectUtil.isNotEmpty(payAmount) ? payAmount.divide(orderInfo.getOrderAmount(), 2, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_DOWN) : null); orderInfo.setPayType("cash"); @@ -981,7 +981,7 @@ public class PayService { orderInfo.setPayAmount(ObjectUtil.isEmpty(payAmount) ? orderInfo.getOrderAmount() : payAmount); - orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount) ? BigDecimal.ZERO : discountAmount); + orderInfo.setDiscountAmount(ObjectUtil.isEmpty(discountAmount) ? null : discountAmount); orderInfo.setStaffId(ObjectUtil.isEmpty(staff) ? null : staff.getId()); orderInfo.setDiscountRatio(ObjectUtil.isNotEmpty(payAmount) ? payAmount.divide(orderInfo.getOrderAmount(), 2, RoundingMode.HALF_UP).setScale(2, RoundingMode.HALF_DOWN) : null); orderInfo.setPayType("cash");