From 6b68d921bcdb83ac4e33c521f0d5f8b4f6f18584 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 08 十一月 2024 15:37:37 +0800
Subject: [PATCH] add:钱包功能调整1108
---
src/main/java/com/mzl/flower/service/payment/OrderService.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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 3bdc188..d8a9c9d 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -453,7 +453,7 @@
}
}
- public Map commitOrder(OrderCommitDTO dto, PreOrderDTO p, Map<Long, PriceDTO> priceMap) {
+ public Map commitOrder(OrderCommitDTO dto, PreOrderDTO p, Map<Long, PriceDTO> priceMap) throws Exception {
String userId = SecurityUtils.getUserId();
p.getFlowers().forEach(flower -> {
// 限购数量 鲜花数量校验
@@ -528,7 +528,7 @@
}
totalAmount = totalAmount.add(p.getPacking()).add(transportFee);
if(totalAmount.doubleValue() <= 0){//假如总价小于等于0，则支付0.01元
- totalAmount = new BigDecimal(0.01);
+ totalAmount = new BigDecimal("0.01");
}
order.setTotalAmount(totalAmount);
@@ -775,7 +775,6 @@
if(orders == null || orders.size() == 0){
return;
}
- /*
for (Order o : orders) {
//set status_backend = 'RECEIVE', status = 'RECEIVE'
o.setStatusBackend("RECEIVE");
@@ -792,8 +791,7 @@
orderMapper.updateById(o);
}
- */
- orderMapper.setPartnerOrderReceive();
+ //orderMapper.setPartnerOrderReceive();
}
/**
@@ -814,7 +812,6 @@
o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.RECEIVE.name());
o.update(SecurityUtils.getUserId());
- /*
//发送微信发货请求
JSONObject jsonObject = sendWxDeliveryGood(o);
if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
@@ -824,7 +821,7 @@
o.setWxDeliveryGood(false);
o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
}
- */
+
orderMapper.updateById(o);
}
@@ -1238,7 +1235,6 @@
customerPointService.consumptionPoint(totalAmount, o.getOrderNo(), o.getCreateBy());
}
- /*
public JSONObject sendWxDeliveryGood(Order o) {
JSONObject json = new JSONObject();
List<OrderItem> items = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
@@ -1277,7 +1273,6 @@
return json;
}
}
- */
public Order confirmOrderReceive(String id) {
Order o = orderMapper.selectById(id);
@@ -1432,7 +1427,7 @@
return dto;
}
- public void processAbnormalOrder(String id) {
+ public void processAbnormalOrder(String id) throws Exception {
Order o = orderMapper.selectById(id);
String transferId = o.getTransferId();
if (StringUtils.isNotEmpty(transferId)) {
@@ -1477,7 +1472,7 @@
orderMapper.updateById(o);
}
- public void processLevelDown(OrderReduceDTO dto) {
+ public void processLevelDown(OrderReduceDTO dto) throws Exception {
Order o = orderMapper.selectById(dto.getId());
String transferId = o.getTransferId();
if (StringUtils.isNotEmpty(transferId)) {
--
Gitblit v1.9.3