From 0867ea81d6b97e5f7d71dc0318e3fd84b64bdb54 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 15 四月 2026 22:33:31 +0800
Subject: [PATCH] 支付对接
---
UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index c823bf6..ff87ce8 100644
--- a/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -465,7 +465,7 @@
/// 新增预计送达时间
if (ToolUtil.isNotEmpty(arriveTime)){
- orderLogistics.setArriveTimeExpect(com.stylefeng.guns.core.util.DateUtil.parseTime1(arriveTime));
+ orderLogistics.setArriveTimeExpect(DateUtil.getDate(arriveTime, "yyyy-MM-dd HH:mm:ss"));
}
/// 生成取件码
@@ -874,9 +874,15 @@
ResultUtil resultUtil = ResultUtil.success(new Object());
if(payType == 1){//微信支付
- String app = type == 1 ? "APP" : "JSAPI";
- resultUtil = payMoneyUtil.weixinpay("小件物流补差价", "", orderId + "_" + orderLogistics.getType() + "_" + UUIDUtil.getRandomCode(5), orderMoney.toString(), "/base/wxPayOrderLogisticsSpread", app, userInfo.getAppletsOpenId());
- paymentRecordService.saveData(1, orderLogistics.getUserId(), 1, orderId, orderLogistics.getType(), 1, orderMoney, "", 1);//添加预支付数据
+ String outTradeNo = "SPREAD_" + orderId + "_" + orderLogistics.getType() + "_" + UUIDUtil.getRandomCode(5);
+ JSONObject response = cbyzxOrderPayHelper.createOrder(orderLogistics.getUserId(), userInfo.getAppletsOpenId(), outTradeNo, orderMoney);
+ if (!cbyzxOrderPayHelper.isCreateSuccess(response)) {
+ return ResultUtil.error(cbyzxOrderPayHelper.extractMessage(response), response);
+ }
+ String recordCode = cbyzxOrderPayHelper.extractRecordCode(response);
+ String paymentCode = ToolUtil.isNotEmpty(recordCode) ? recordCode : outTradeNo;
+ paymentRecordService.saveData(1, orderLogistics.getUserId(), 1, orderId, orderLogistics.getType(), 1, orderMoney, paymentCode, 1);//添加预支付数据
+ resultUtil = ResultUtil.success(response);
}
if(payType == 2){//支付宝支付
resultUtil = payMoneyUtil.alipay("小件物流补差价", "小件物流补差价", "", orderId + "_" + orderLogistics.getType() + "_" + UUIDUtil.getRandomCode(5), orderMoney.toString(), "/base/aliPayOrderLogisticsSpread");
@@ -1628,9 +1634,15 @@
OrderLogistics orderLogistics = this.selectById(orderId);
ResultUtil resultUtil = ResultUtil.success();
if(payType == 1){//微信支付
- String app = type == 1 ? "APP" : "JSAPI";
- resultUtil = payMoneyUtil.weixinpay("感谢费", "", orderId + "_" + orderLogistics.getType() + "_" + UUIDUtil.getRandomCode(5), money.toString(), "/base/wxPayThankYouFee", app, userInfo.getAppletsOpenId());
- paymentRecordService.saveData(3, uid, 1, orderId, orderLogistics.getType(), 1, money, "", 1);//添加预支付数据
+ String outTradeNo = "THANK_" + orderId + "_" + orderLogistics.getType() + "_" + UUIDUtil.getRandomCode(5);
+ JSONObject response = cbyzxOrderPayHelper.createOrder(orderLogistics.getUserId(), userInfo.getAppletsOpenId(), outTradeNo, money);
+ if (!cbyzxOrderPayHelper.isCreateSuccess(response)) {
+ return ResultUtil.error(cbyzxOrderPayHelper.extractMessage(response), response);
+ }
+ String recordCode = cbyzxOrderPayHelper.extractRecordCode(response);
+ String paymentCode = ToolUtil.isNotEmpty(recordCode) ? recordCode : outTradeNo;
+ paymentRecordService.saveData(3, uid, 1, orderId, orderLogistics.getType(), 1, money, paymentCode, 1);//添加预支付数据
+ resultUtil = ResultUtil.success(response);
}
if(payType == 2){//支付宝支付
resultUtil = payMoneyUtil.alipay("感谢费", "感谢费", "", orderId + "_" + orderLogistics.getType() + "_" + UUIDUtil.getRandomCode(5), money.toString(), "/base/aliPayThankYouFee");
--
Gitblit v1.7.1