From ae1471f378f399f76518539ec8992e64a3673436 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 08 一月 2025 15:26:06 +0800
Subject: [PATCH] 1.订单提交：订单最小金额配置
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 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 497b07c..2dcfedd 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -45,6 +45,7 @@
import com.mzl.flower.mapper.system.UserWechatMapper;
import com.mzl.flower.mapper.warehouse.WarehouseLocationMapper;
import com.mzl.flower.service.BaseService;
+import com.mzl.flower.service.ConfigParamService;
import com.mzl.flower.service.comment.FlowerCommentService;
import com.mzl.flower.service.coupon.CouponRecordService;
import com.mzl.flower.service.flower.FlowerService;
@@ -170,6 +171,8 @@
@Autowired
private FlowerCommentService flowerCommentService;
+ @Autowired
+ private ConfigParamService configParamService;
public void changeFlower2Cart(CartSaveDTO dto) {
String userId = SecurityUtils.getUserId();
@@ -495,6 +498,19 @@
usePointGoods(order.getId(), goodsRecordIdList);//使用积分商品兑换券
order.create(userId);
+ // 根据当前的时间判断，如果时间大于当天的下午17:00 ，那么日期则为下一天的日期，否则为当天日期
+ if(null!=order.getCreateTime()){
+ LocalDateTime createDateTime = order.getCreateTime();
+ LocalDate createDate = createDateTime.toLocalDate();
+ LocalDateTime today1700 = createDateTime.with(LocalTime.of(17, 0));
+ // 比较时间是否大于当天的 17:00
+ if (createDateTime.isAfter(today1700)) {
+ // 如果大于 17:00，设置为下一天的日期
+ createDate = createDate.plusDays(1);
+ }
+ order.setCreateDateSta(createDate);
+ }
+// order.setCreateDate();
order.setRemarks(dto.getRemarks());
order.setSpecialNeeds(dto.getSpecialNeeds());
order.setStatusBackend(Constants.ORDER_STATUS_BACKEND.PENDING.name());
@@ -527,9 +543,26 @@
totalAmount = new BigDecimal(0);
}
totalAmount = totalAmount.add(p.getPacking()).add(transportFee);
- if(totalAmount.doubleValue() <= 0){//假如总价小于等于0，则支付0.01元
- totalAmount = new BigDecimal("0.01");
+
+ // 判断最低金额如果小于配置的钱，则不能提交
+ String paramGroup = "orderpay";
+ String paramKey = "order_min_fee";
+ String baseString = configParamService.getBaseString(paramGroup, paramKey);
+ if(StringUtils.isNotEmpty(baseString)){
+ // 判断类型是否错误，可转换成BigDecimal
+ try {
+ BigDecimal minFee = new BigDecimal(baseString);
+ if(totalAmount.compareTo(minFee) < 0){
+ throw new ValidationException("订单金额不能低于"+minFee+"元");
+ }
+ } catch (NumberFormatException e) {
+ log.error("订单金额配置有误，请检查配置", e);
+ throw new ValidationException("订单金额配置有误，请检查配置");
+ }
}
+// if(totalAmount.doubleValue() <= 0){//假如总价小于等于0，则支付0.01元
+// totalAmount = new BigDecimal("0.01");
+// }
order.setTotalAmount(totalAmount);
order.setCustomer(address.getName());
@@ -1186,7 +1219,11 @@
}
public List<Order> autoReceive() {
- int days = -5; //5天前的订单自动收货
+ String paramGroup = "order";
+ String paramKey = "order_auto_receive";
+ String baseString = configParamService.getBaseString(paramGroup, paramKey);
+ int days = -Integer.parseInt(baseString);
+// int days = -5; //5天前的订单自动收货
LocalDateTime endTime = LocalDateTime.now().plusDays(days);
List<Order> ls = orderMapper.getOrderForAutoReceive(endTime);
if (ls == null || ls.size() == 0) {
@@ -1798,4 +1835,15 @@
exportOrderDetail(response, dto);
}
+ public void refreshDate() {
+ List<Order> allOrderList= orderMapper.selectAllDateList();
+
+ allOrderList.forEach(order -> {
+ orderMapper.updatePaymentCreateDate(order);
+ });
+ }
+
+ public Order getOrderInfoById(String id) {
+ return orderMapper.selectById(id);
+ }
}
--
Gitblit v1.9.3