From 9faac602a31237bfc67b0b0748af1b31f5302482 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 02 九月 2025 14:21:53 +0800
Subject: [PATCH] 暂存0829
---
service-acct/src/main/java/com/java110/acct/cmd/payment/NativeQrcodePaymentCmd.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/cmd/payment/NativeQrcodePaymentCmd.java b/service-acct/src/main/java/com/java110/acct/cmd/payment/NativeQrcodePaymentCmd.java
index a6d3c4b..0e4547b 100644
--- a/service-acct/src/main/java/com/java110/acct/cmd/payment/NativeQrcodePaymentCmd.java
+++ b/service-acct/src/main/java/com/java110/acct/cmd/payment/NativeQrcodePaymentCmd.java
@@ -7,6 +7,7 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.CallApiServiceFactory;
import com.java110.core.factory.CommunitySettingFactory;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.core.factory.WechatFactory;
@@ -136,13 +137,11 @@
paymentOrderDto.setUserId(userId);
reqJson.put("money", paymentOrderDto.getMoney());
- String token = GenerateCodeFactory.getUUID();
-
// redis 涓� 淇濆瓨 璇锋眰鍙傛暟
- CommonCache.setValue("nativeQrcodePayment_" + token, reqJson.toJSONString(), CommonCache.PAY_DEFAULT_EXPIRE_TIME);
+ CommonCache.setValue("nativeQrcodePayment_" + paymentOrderDto.getOrderId(), reqJson.toJSONString(), CommonCache.PAY_DEFAULT_EXPIRE_TIME);
JSONObject result = new JSONObject();
- String notifyUrl = UrlCache.getOwnerUrl() + "/app/payment/notify/wechat/"+appId+"/"+reqJson.getString("paymentPoolId");
+ String notifyUrl = UrlCache.getOwnerUrl() + "/app/payment/notify/nativeWechat/"+appId+"/"+reqJson.getString("paymentPoolId");
//
//
@@ -159,8 +158,7 @@
paramMap.put("mchnt_cd", smallWeChatDto.getMchId()); // 瀵屽弸鍒嗛厤缁欎簩绾у晢鎴风殑鍟嗘埛鍙�
paramMap.put("random_str", PayUtil.makeUUID(32));
paramMap.put("order_amt", (int)(paymentOrderDto.getMoney()*100));
- String generatorId = GenerateCodeFactory.getGeneratorId("81");
- paramMap.put("mchnt_order_no", smallWeChatDto.getOrderPre() + generatorId);
+ paramMap.put("mchnt_order_no", smallWeChatDto.getOrderPre() + paymentOrderDto.getOrderId());
paramMap.put("txn_begin_ts", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_DEFAULT));
paramMap.put("goods_des", systemName + "娴嬭瘯");
paramMap.put("term_id", "abcdefgh");
@@ -181,6 +179,7 @@
, HttpMethod.POST, httpEntity, String.class);
if(JSONObject.parseObject(responseEntity.getBody()).get("result_msg").equals("SUCCESS")){
result.put("codeUrl", JSONObject.parseObject(responseEntity.getBody()).get("qr_code"));
+ result.put("orderId", paymentOrderDto.getOrderId());
ResponseEntity<String> responseEntity2 = ResultVo.createResponseEntity(result);
logger.debug("璋冪敤鏀粯鍘傚杩斿洖,{}", responseEntity2);
context.setResponseEntity(responseEntity2);
--
Gitblit v1.8.0