lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

支付修改

localizer
ljw 2025-10-23 15:52:15 +08:00
parent 88712f4fbd
commit 861d135b66
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
njzscloud-svr/src/main/java/com/njzscloud/supervisory/order/service/OrderInfoService.java
View File

@ -728,26 +728,15 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
// 处理公司支付
handleCompanyPay(orderInfo);
// 更新订单支付状态为已支付
this.updateById(new OrderInfoEntity()
.setId(orderInfoId)
.setCargoPhoto(startTransportOrderParam.getCargoPhoto())
.setOrderStatus(OrderStatus.QingYunZhong)
.setTransTime(LocalDateTime.now())
.setPaymentStatus(PaymentStatus.YiZhiFu)
.setPaymentCategory(PaymentWay.COMPANY.getVal())
.setPayTime(LocalDateTime.now())
);
} else {
this.updateById(new OrderInfoEntity()
.setId(orderInfoId)
.setCargoPhoto(startTransportOrderParam.getCargoPhoto())
.setOrderStatus(OrderStatus.QingYunZhong)
.setTransTime(LocalDateTime.now())
);
}
this.updateById(new OrderInfoEntity()
.setId(orderInfoId)
.setCargoPhoto(startTransportOrderParam.getCargoPhoto())
.setOrderStatus(OrderStatus.QingYunZhong)
.setTransTime(LocalDateTime.now())
);
Long truckId = orderInfo.getTruckId();
Assert.notNull(truckId, () -> Exceptions.clierr("订单未分配车辆"));
BizTruckEntity truckInfo = baseMapper.getTruckInfo(truckId);
@ -828,6 +817,14 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
log.info("公司账户扣减成功，用户ID：{}，扣减金额：{}，余额：{} -> {}，结算方式：{}",
ctx.getCompanyUserId(), ctx.getSettleMoney(), oldBalance, newBalance, ctx.getSettlementWay());
// 更新订单支付状态为已支付
this.updateById(new OrderInfoEntity()
.setId(orderInfo.getId())
.setPaymentStatus(PaymentStatus.YiZhiFu)
.setPaymentCategory(PaymentWay.COMPANY.getVal())
.setPayTime(LocalDateTime.now())
);
}
}
@ -1084,13 +1081,6 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
// 扣费
handleCompanyPay(orderInfoEntity);
// 更新订单支付状态为已支付
this.updateById(new OrderInfoEntity()
.setId(orderInfoEntity.getId())
.setPaymentStatus(PaymentStatus.YiZhiFu)
.setPaymentCategory(PaymentWay.COMPANY.getVal())
.setPayTime(LocalDateTime.now())
);
}
} finally {

2
njzscloud-svr/src/main/resources/mapper/biz/BizTruckMapper.xml
View File

@ -35,7 +35,7 @@
a.disabled,
c.last_time >= DATE_SUB(NOW(), INTERVAL 5 MINUTE) `online`
FROM biz_truck a
INNER JOIN biz_company b ON b.id = a.company_id
LEFT JOIN biz_company b ON b.id = a.company_id
LEFT JOIN device_localizer c ON c.terminal_id = a.gps
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}