From 84620b593b9034bb28ba23c730392991cdf37a8b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 03 七月 2023 18:05:38 +0800
Subject: [PATCH] 修改bug
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java
index d9ab0f3..bbc9e0c 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java
@@ -26,6 +26,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -373,9 +375,9 @@
if(2 == status){
Order order = orderService.selectById(orderId);
AccountChangeDetail accountChangeDetail = accountChangeDetailService.selectById(parameter2);
- Double m = accountChangeDetail.getOldData() - accountChangeDetail.getNewData();
+ Double m = new BigDecimal(accountChangeDetail.getOldData()).subtract(new BigDecimal(accountChangeDetail.getNewData())).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
AppUser appUser1 = appUserService.selectById(order.getUserId());
- appUser1.setAccountBalance(appUser1.getAccountBalance() + m);
+ appUser1.setAccountBalance(new BigDecimal(appUser1.getAccountBalance()).add(new BigDecimal(m)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
appUserService.updateById(appUser1);
accountChangeDetailService.deleteById(accountChangeDetail.getId());
System.err.println("支付失败");
@@ -456,18 +458,22 @@
}
String merOrderId = jsonObject.getString("merOrderId");
String divisionRecordId = jsonObject.getString("parameter1");
+ DivisionRecord divisionRecord = divisionRecordService.selectById(divisionRecordId);
+ if(divisionRecord.getState() == 2){
+
+ }
+
//确认收货
new Timer().schedule(new TimerTask() {
@Override
public void run() {
- DivisionRecord divisionRecord = divisionRecordService.selectById(divisionRecordId);
Receive receive = new Receive();//确认收货
receive.setOriginalMerOrderId(merOrderId);
- receive.setRcvAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
+ receive.setRcvAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
List<ReceiveUser> splitList = new ArrayList<>();
ReceiveUser receiveUser = new ReceiveUser();
receiveUser.setSplitUserId(divisionRecord.getMerchantNumber());
- receiveUser.setRcvSplitAmount(String.valueOf(Double.valueOf(divisionRecord.getAmount() * 100).intValue()));
+ receiveUser.setRcvSplitAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
splitList.add(receiveUser);
receive.setSplitList(splitList);
TrhRequest<Receive> request1 = new TrhRequest();
@@ -484,7 +490,7 @@
logger.warn("确认收货处理中");
}
}
- }, 15000);
+ }, 60000);
response.setStatus(200);
PrintWriter out = response.getWriter();
out.print("OK");
--
Gitblit v1.7.1