From 65516d3f4fd7fee2c3f6c72ba634584223151e77 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 30 九月 2024 13:39:09 +0800
Subject: [PATCH] 1.报表验证
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 3b76438..3ebd8d4 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -496,7 +496,7 @@
order.setMemberName(p.getMemberName());
order.setMemberDiscountType(p.getMemberDiscountType());
order.setMemberDiscountRatio(p.getMemberDiscountRatio());
- order.setMemberCouponAmount(p.getMemberDiscountAmount());
+ order.setMemberDiscountAmount(p.getMemberDiscountAmount());
order.setFlowerAmount(p.getTotalMemberAmount());//使用会员价总价
order.setPackingFee(p.getPacking());
@@ -642,7 +642,7 @@
return new BigDecimal(0);
}
- if(couponAmount.doubleValue() >= totalAmount.doubleValue()){
+ if(couponAmount.compareTo(totalAmount) >= 0){
return price;
}
if(isLastOne){//最后的商品使用优惠券剩下的面值
@@ -1426,15 +1426,15 @@
deductAmount = deductAmount.add(a.getDeductAmount());
}
+ o.setTransferTime(LocalDateTime.now());
+ o.update(SecurityUtils.getUserId());
+
transferId = "NoNeedRefund";
if (deductAmount.doubleValue() > 0) {
transferId = paymentV3Service.refundOrderSub(o, deductAmount);
}
o.setTransferId(transferId);
- o.setTransferTime(LocalDateTime.now());
- o.update(SecurityUtils.getUserId());
orderMapper.updateById(o);
-
}
public void processLevelDown(OrderReduceDTO dto) {
@@ -1685,4 +1685,24 @@
return sb.toString();
}
+
+ public void operationUpdate(OrderAddressUpdateDTO dto) {
+ if (StringUtils.isBlank(dto.getId())) {
+ throw new ValidationException("id不能为空");
+ }
+ Order order = orderMapper.selectById(dto.getId());
+ if (ObjectUtils.isEmpty(order)) {
+ throw new ValidationException("订单不存在");
+ }
+ if (StringUtils.isBlank(dto.getCustomerAddress()) || StringUtils.isBlank(dto.getCustomerCity()) || StringUtils.isBlank(dto.getCustomerProvince()) || StringUtils.isBlank(dto.getCustomerRegion())) {
+ throw new ValidationException("地址信息不能为空");
+ }
+ if (StringUtils.isBlank(dto.getCustomerTel())) {
+ throw new ValidationException("联系方式不能为空");
+ }
+ BeanUtils.copyProperties(dto, order);
+ order.update(SecurityUtils.getUserId());
+ orderMapper.updateById(order);
+ }
+
}
--
Gitblit v1.9.3