From 7afa9987e2ac69d8d2444240d359c389f978f345 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期六, 23 十二月 2023 17:58:02 +0800
Subject: [PATCH] 11.27,9
---
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 14 +++++++-------
cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index c666c39..979be10 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -1707,11 +1707,12 @@
* @return
* @throws Exception
*/
+ private String smid = "2088330203191220";//平台支付宝商户号
public ResultUtil aliPaymentCoupon(String body, UserCouponPayment userCouponPayment) throws Exception {
String code = userCouponPayment.getCode();
Double cash = userCouponPayment.getCash();
- ResultUtil alipay = payMoneyUtil.alipay(body, body, "", code, cash.toString(), "/base/coupon/aliPaymentCouponCallback");
+ ResultUtil alipay = payMoneyUtil.alipay(smid, body, "",String.valueOf(userCouponPayment.getId()), code, cash.toString(), "/base/coupon/aliPaymentCouponCallback");
if (alipay.getCode() == 200) {
new Thread(new Runnable() {
@Override
@@ -1746,8 +1747,7 @@
userCouponPaymentClient.updateUserCouponPayment(userCouponPayment1);
if ("TRADE_FINISHED".equals(s)) {
// todo 资金结算
- payMoneyUtil.confirm(code,tradeNo,cash.toString());
- break;
+
}
break;
}
@@ -1756,21 +1756,21 @@
userCouponPayment1.setPaymentTime(new Date());
userCouponPayment1.setOrderNumber(tradeNo);
userCouponPaymentClient.updateUserCouponPayment(userCouponPayment1);
-
UserCoupon userCoupon = new UserCoupon();
userCoupon.setCouponId(userCouponPayment1.getCouponId());
userCoupon.setUserId(userCouponPayment1.getUserId());
userCoupon.setStatus(1);
userCoupon.setInsertTime(new Date());
userConponClient.insertToAppuserCoupon(userCoupon);
-
if(null != userCouponPayment1.getIntegral() && 0 != userCouponPayment1.getIntegral()){
//扣积分
TAppUser user = appUserService.getById(userCouponPayment1.getUserId());
user.setIntegral(user.getIntegral() - userCouponPayment1.getIntegral().intValue());
appUserService.updateById(user);
}
+ payMoneyUtil.confirm(smid,code,tradeNo,cash.toString());
break;
+
}
if ("WAIT_BUYER_PAY".equals(s)) {
@@ -1844,7 +1844,7 @@
}
private ResultUtil AlipayPayment(BigDecimal cash, String code, Long returnId) {
- ResultUtil alipay = payMoneyUtil.alipay("优惠卷", "优惠卷", String.valueOf(returnId), code, cash.toString(),
+ ResultUtil alipay = payMoneyUtil.alipay(smid,"优惠卷", "优惠卷", String.valueOf(returnId), code, cash.toString(),
"/base/pointMer/exchangeGoodPaymentAliCallback");
if (alipay.getCode() == 200) {
new Thread(new Runnable() {
@@ -1894,7 +1894,7 @@
}
if ("TRADE_FINISHED".equals(tradeStatus)) {
// todo 资金结算
- payMoneyUtil.confirm(code,tradeNo,cash.toString());
+ payMoneyUtil.confirm(smid,code,tradeNo,cash.toString());
break;
}
// if("REFUND".equals(tradeStatus) || "NOTPAY".equals(tradeStatus) || "CLOSED".equals(tradeStatus) || "REVOKED".equals(tradeStatus) || "PAYERROR".equals(tradeStatus) || num == 10){
diff --git a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
index 3692928..1038309 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/util/PayMoneyUtil.java
@@ -158,7 +158,7 @@
model.setProductCode("QUICK_MSECURITY_PAY");
model.setPassbackParams(passbackParams);//自定义参数
ExtendParams extendParams = new ExtendParams();
- extendParams.setRoyaltyFreeze("false");// 冻结资金 用于后续分账处理
+ extendParams.setRoyaltyFreeze("true");// 冻结资金 用于后续分账处理
model.setExtendParams(extendParams);
//分账
// Integer coursePackagePayments = coursePackageClient.queryByCode(outTradeNo);
--
Gitblit v1.7.1