From 7732cac9da04bb75e9f655b6fd7e068e14bfc1cc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 16:06:19 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index fea75bd..9a6eb28 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -419,7 +419,7 @@
String randomCode = UUIDUtil.getRandomCode();
redisUtil.setStrValue("trip" + orderPrivateCar.getUserId(), randomCode);
OrderPrivateCar orderPrivateCar1 = new OrderPrivateCar();
- orderPrivateCar1.setId(orderPrivateCar.getCarId());
+ orderPrivateCar1.setId(orderPrivateCar.getId());
orderPrivateCar1.setTripId(randomCode);
this.updateById(orderPrivateCar1);
orderPrivateCar.setTripId(randomCode);
@@ -901,10 +901,11 @@
//修改行程信息
if(orderPrivateCar.getState() == 10 || orderPrivateCar.getState() == 12){
- boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, orderPrivateCar.getTripId(), null, null, null, null);
+ Car car = carService.selectById(orderPrivateCar.getCarId());
+ boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, orderPrivateCar.getTripId(), null, null, null, null);
if(!updateTrip){
for (int i = 0; i < 5; i++) {
- updateTrip = fleetEngineUtil.updateTrip("CANCELED", null, null, orderPrivateCar.getTripId(), null, null, null, null);
+ updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, orderPrivateCar.getTripId(), null, null, null, null);
if(updateTrip){
break;
}
@@ -1185,7 +1186,7 @@
@Override
public synchronized String getOrderNum() throws Exception{
int size = this.selectCount(null);
- return "PRIVATE" + String.valueOf(1000000 + size + 1).substring(1);
+ return "RIDE" + String.valueOf(1000000 + size + 1).substring(1);
}
/**
@@ -1257,7 +1258,7 @@
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ResultUtil payPrivateCarOrder(Integer payType, Integer bankCardId, Integer orderId, Integer couponId, Integer redDeduction, Integer type, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
if(orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9){
@@ -1322,10 +1323,9 @@
if(null != redDeduction && 1 == redDeduction && null == orderPrivateCar.getRedPacketId()){
RedEnvelopePaymentSettings redEnvelopePaymentSettings = redEnvelopePaymentSettingsService.getRedEnvelopePaymentSettings();
if(null != redEnvelopePaymentSettings){
- Double total = userRedPacketRecordService.queryRemainingAmount(uid);
List<UserRedPacketRecord> userRedPacketRecords = userRedPacketRecordService.selectList(new EntityWrapper<UserRedPacketRecord>().eq("userId", uid)
.eq("state", 1).eq("companyId", orderPrivateCar.getCompanyId()).gt("remainingAmount", 0).orderBy("insertTime", false));
-
+ Double total = userRedPacketRecords.stream().mapToDouble(UserRedPacketRecord::getRemainingAmount).sum();
BigDecimal deductionRatio = redEnvelopePaymentSettings.getDeductionRatio();
BigDecimal multiply1 = orderMoney.multiply(deductionRatio.divide(new BigDecimal(100))).setScale(2, RoundingMode.HALF_EVEN);
if(total > 0 && multiply1.doubleValue() > 0 && total.compareTo(multiply1.doubleValue()) >= 0){
@@ -1335,12 +1335,10 @@
//获取红包id
JSONArray jsonArray = new JSONArray();
for (UserRedPacketRecord userRedPacketRecord : userRedPacketRecords) {
- if(multiply1.compareTo(BigDecimal.ZERO) == 0){
- break;
- }
JSONObject jsonObject = new JSONObject();
jsonObject.put("id", userRedPacketRecord.getId());
BigDecimal remainingAmount = new BigDecimal(userRedPacketRecord.getRemainingAmount());
+
if(multiply1.compareTo(remainingAmount) >= 0){
userRedPacketRecord.setRemainingAmount(0D);
userRedPacketRecord.setEndTime(new Date());
@@ -1353,14 +1351,14 @@
jsonObject.put("money", multiply1.setScale(2, RoundingMode.HALF_EVEN));
jsonArray.add(jsonObject);
multiply1 = BigDecimal.ZERO;
+ break;
}
}
if(userRedPacketRecords.size() > 0){
userRedPacketRecordService.updateBatchById(userRedPacketRecords);
}
orderPrivateCar.setRedPacketId(jsonArray.toJSONString());
- }
- if(total > 0 && total.compareTo(multiply1.doubleValue()) < 0){
+ }else if(total > 0 && total.compareTo(multiply1.doubleValue()) < 0){
orderPrivateCar.setRedPacketMoney(total);
orderMoney = orderMoney.subtract(new BigDecimal(total)).setScale(2, RoundingMode.HALF_EVEN);
//获取红包id
@@ -1896,8 +1894,6 @@
? "You've paid for the ride order successfully, thank you for using I-GO"
: "Vous avez payé la commande de course avec succès, merci d’utiliser I-GO", orderPrivateCar.getUserId(), 1);
}
-
-
if(payType == 4){//现金支付
SysIntegral query1 = sysIntegralMapper.query(orderPrivateCar.getCompanyId());
userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分
--
Gitblit v1.7.1