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

开门

localizer
ljw 2025-10-25 17:01:07 +08:00
parent 077aefb7a8
commit cc965a0d53
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ import com.njzscloud.supervisory.biz.service.TruckLocationTrackService;
import com.njzscloud.supervisory.config.AppProperties;
import com.njzscloud.supervisory.constant.Constant;
import com.njzscloud.supervisory.device.pojo.entity.DeviceLocalizerEntity;
import com.njzscloud.supervisory.device.service.DeviceInfoService;
import com.njzscloud.supervisory.expense.contant.ExpenseItemCategory;
import com.njzscloud.supervisory.expense.contant.Scope;
import com.njzscloud.supervisory.expense.pojo.entity.ExpenseItemsConfigEntity;
@ -727,7 +728,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
settleForTransCompany(orderInfo, entity, 0);
// 处理公司支付
handleCompanyPay(orderInfo);
handleCompanyPay(orderInfo, Boolean.TRUE);
}
this.updateById(new OrderInfoEntity()
@ -773,7 +774,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
});
}
public void handleCompanyPay(OrderInfoEntity orderInfo) {
public void handleCompanyPay(OrderInfoEntity orderInfo, Boolean isIn) {
PaymentContextResult ctx = paymentContext(orderInfo.getId());
if (!SettlementWay.CASH.getVal().equals(ctx.getSettlementWay())) {
/*// 验证资金账户信息
@ -821,10 +822,15 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
this.updateById(new OrderInfoEntity()
.setId(orderInfo.getId())
.setPaymentStatus(PaymentStatus.YiZhiFu)
.setOrderStatus(OrderStatus.YiWanCheng)
.setPaymentCategory(PaymentWay.COMPANY.getVal())
.setPayTime(LocalDateTime.now())
);
if (!isIn) {
DeviceInfoService.open(orderInfo.getSn());
}
}
}
@ -1079,7 +1085,7 @@ public class OrderInfoService extends ServiceImpl<OrderInfoMapper, OrderInfoEnti
settleForTransCompany(orderInfoEntity, entity, settleWeight);
// 扣费
handleCompanyPay(orderInfoEntity);
handleCompanyPay(orderInfoEntity, Boolean.FALSE);
return false;
} else {
return true;

18
njzscloud-svr/src/main/java/com/njzscloud/supervisory/wxPay/controller/PaymentController.java
View File

@ -1,6 +1,8 @@
package com.njzscloud.supervisory.wxPay.controller;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.IdUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
@ -15,13 +17,18 @@ import com.njzscloud.common.security.ex.UserLoginException;
import com.njzscloud.common.wechat.WechatUtil;
import com.njzscloud.common.wechat.param.Code2SessionParam;
import com.njzscloud.common.wechat.result.Code2SessionResult;
import com.njzscloud.supervisory.device.service.DeviceInfoService;
import com.njzscloud.supervisory.money.contant.MoneyChangeCategory;
import com.njzscloud.supervisory.money.pojo.entity.MoneyAccountEntity;
import com.njzscloud.supervisory.money.pojo.entity.MoneyChangeDetailEntity;
import com.njzscloud.supervisory.money.service.MoneyAccountService;
import com.njzscloud.supervisory.money.service.MoneyChangeDetailService;
import com.njzscloud.supervisory.order.contant.MoneyWay;
import com.njzscloud.supervisory.order.contant.OrderStatus;
import com.njzscloud.supervisory.order.contant.PaymentStatus;
import com.njzscloud.supervisory.order.contant.PaymentWay;
import com.njzscloud.supervisory.order.pojo.entity.OrderGoodsEntity;
import com.njzscloud.supervisory.order.service.OrderGoodsService;
import com.njzscloud.supervisory.wxPay.dto.RefundRequestDto;
import com.njzscloud.supervisory.order.pojo.entity.OrderExpenseItemsEntity;
import com.njzscloud.supervisory.order.pojo.entity.OrderInfoEntity;
@ -61,6 +68,7 @@ public class PaymentController {
private final WeChatPayService wechatPayService;
private final WxPayService wxPayService;
private final WxPayProperties properties;
private final OrderGoodsService orderGoodsService;
/**
* 发起支付（使用生产级微信支付SDK）
@ -206,11 +214,21 @@ public class PaymentController {
orderInfoService.lambdaUpdate()
.eq(OrderInfoEntity::getSn, orderSn)
.set(OrderInfoEntity::getPaymentStatus, PaymentStatus.YiZhiFu)
.set(OrderInfoEntity::getOrderStatus, OrderStatus.YiWanCheng)
.set(OrderInfoEntity::getPayTime, LocalDateTime.now())
.update();
log.info("微信支付成功，商户订单号：{}，微信交易号：{}",
orderSn, notifyResult.getTransactionId());
OrderInfoEntity entity = orderInfoService.getOne(Wrappers.<OrderInfoEntity>lambdaQuery().eq(OrderInfoEntity::getSn, orderSn));
if (entity == null) {
log.info("订单信息不存在：{}", orderSn);
} else {
OrderGoodsEntity orderGoodsEntity = orderGoodsService.getById(entity.getGoodsId());
if (MoneyWay.OUT.getVal().equals(orderGoodsEntity.getMoneyWay())) {
DeviceInfoService.open(orderSn);
}
}
} else {
log.warn("无法从商户订单号中提取订单");
}