hbyt/cloud-battery-manage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: hbyt:master
Branches Tags
hbyt:master
hbyt:order_reconstruction
hbyt:mongodb_dev
hbyt:influxdb_dev
hbyt:permission_dev
...
pull from: hbyt:permission_dev
Branches Tags
hbyt:master
hbyt:order_reconstruction
hbyt:mongodb_dev
hbyt:influxdb_dev
hbyt:permission_dev

2 Commits
master ... permission

Author SHA1 Message Date
lhb
90bc96e060 fix:充值明细关联订单信息 2025-04-19 13:25:48 +08:00
lhb
e963606b0b fix:扫码支付输出回调信息 2025-04-18 16:37:30 +08:00
3 changed files with 17 additions and 0 deletions
Show Stats Expand all files Collapse all files

8
base-commons/common-core/src/main/java/com/evotech/hd/common/core/entity/cloud/WalletAccountDetail.java
View File

@ -74,4 +74,12 @@ public class WalletAccountDetail extends BaseEntity implements Serializable {
@Schema(description = "交易后赠送金额，分", requiredMode = RequiredMode.REQUIRED)
@NotNull
private Integer afterGiftAmount;
@Schema(description = "订单编号")
private String orderNo;
@Schema(description = "车牌号")
private String plateNum;
@Schema(description = "站点名称")
private String stationName;
}

5
cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/impl/OrderSwapBatteryServiceImpl.java
View File

@ -419,7 +419,12 @@ public class OrderSwapBatteryServiceImpl implements OrderSwapBatteryService {
wad.setAfterTotalAmount(wad.getPreTotalAmount() - Math.abs(wad.getTradeTotalAmount()));
wad.setAfterRechargeAmount(wad.getPreRechargeAmount() - Math.abs(wad.getTradeRechargeAmount()));
wallet.setGiftAmount(wad.getPreGiftAmount() - Math.abs(wad.getTradeGiftAmount()));
wad.setOrderNo(orderNo);
wad.setPlateNum(order.getPlateNum());
wad.setStationName(order.getStationName());//添加订单关联关系及车牌号，站点信息0419
walletAccountService.addDetail(wad);
// 改余额
wallet.setTotalAmount(wad.getAfterTotalAmount());
wallet.setRechargeAmount(wad.getAfterRechargeAmount());

4
cloud-manage-server/src/main/java/com/evotech/hd/cloud/service/newthread/WechatPayNotifyHandleService.java
View File

@ -41,6 +41,7 @@ public class WechatPayNotifyHandleService {
// @Async("taskExecutor")
public void payNotifyBussinessHandle(TradeDetail tradeDetail) {
log.info("\r\n===>>>1回调处理lhb：" + tradeDetail.getTradeType());
if (tradeDetail.getTradeType() == 1) {
// 充值
WalletAccount wallet = walletAccountDao.selectOne(new QueryWrapper<WalletAccount>().eq("code", tradeDetail.getWallet()));
@ -80,6 +81,7 @@ public class WechatPayNotifyHandleService {
templateMessageService.rechargeMessageSend(tradeDetail, wallet.getTotalAmount());
} else if (tradeDetail.getTradeType() == 2) {
log.info("\r\n===>>>2回调处理lhb：" + tradeDetail.getWechatPayApiType());
// 支付订单
if (WechatPayApiTypeEnums.JSAPI.getCode().equals(tradeDetail.getWechatPayApiType())) {
// jsapi支付
@ -124,6 +126,8 @@ public class WechatPayNotifyHandleService {
List<String> orderNoList = list.stream().map(i -> i.getOrderNo()).toList();
List<OrderSwapBattery> orderList = orderSwapBatteryDao.selectList(new QueryWrapper<OrderSwapBattery>()
.eq("status", 6).in("order_no", orderNoList));
log.info("\r\n===>>>3回调处理lhb：" + tradeDetail.getOutTradeNo());
log.info("\r\n===>>>4回调处理lhb：" + orderList.size() +"%%%%%%%"+orderNoList.size());
if (orderList.size() != orderNoList.size()) {
log.info("\r\n **********");
log.error("\r\n===>>>交易订单存在问题：" + tradeDetail);