From a411058cc47109680fa9fa4d2bd7c03d46949a5e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 17 Feb 2023 15:26:04 +0800
Subject: [PATCH] 合伙人权益的后台编辑上传 接口
---
src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
index 47142c0..61e816c 100644
--- a/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
+++ b/src/main/java/cc/mrbird/febs/pay/controller/XcxPayController.java
@@ -13,6 +13,7 @@
import cc.mrbird.febs.mall.entity.MallMoneyFlow;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.mapper.*;
+import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.pay.model.NotifyData;
import cc.mrbird.febs.pay.model.OrderStateDto;
@@ -69,6 +70,8 @@
RedisUtils redisUtils;
@Autowired
private IApiMallMemberWalletService memberWalletService;
+ @Autowired
+ private IApiMallMemberService mallMemberService;
@Autowired
private IXcxPayService iXcxPayService;
@@ -109,6 +112,7 @@
attrStr = data.getAttach();
JSONObject jsonObject = JSONUtil.parseObj(attrStr);
String rechargeNo = (String) jsonObject.get("rechargeNo");
+ Integer type = (Integer) jsonObject.get("type");
Long memberId = Long.parseLong(jsonObject.get("memberId").toString());
// 检验订单状态
MallMoneyFlow mallMoneyFlow = mallMoneyFlowMapper.selectOneByOrderNoAndMemberId(rechargeNo,memberId);
@@ -132,6 +136,9 @@
if (ObjectUtil.isNotEmpty(mallMoneyFlow)) {
log.debug("检查支付金额payMoney={},mallMoneyFlow.getPayMoney()={}", payMoney, mallMoneyFlow.getAmount());
+ if(2 == type){
+ mallMemberService.updateMemberAgent(memberId);
+ }
memberWalletService.addBalance(payMoney,memberId);
mallMoneyFlow.setStatus(2);
mallMoneyFlowMapper.updateById(mallMoneyFlow);
@@ -179,14 +186,14 @@
}
- public static void main(String[] args) {
- String attach="{'rechargeNo':CZ_2022083117160259880,'memberId':47}";
- JSONObject jsonObject = JSONUtil.parseObj(attach);
- String rechargeNo = (String) jsonObject.get("rechargeNo");
- Long memberId = Long.parseLong(jsonObject.get("memberId").toString());
- System.out.println(memberId);
- System.out.println(rechargeNo);
- }
+// public static void main(String[] args) {
+// String attach="{'rechargeNo':CZ_2022083117160259880,'memberId':47}";
+// JSONObject jsonObject = JSONUtil.parseObj(attach);
+// String rechargeNo = (String) jsonObject.get("rechargeNo");
+// Long memberId = Long.parseLong(jsonObject.get("memberId").toString());
+// System.out.println(memberId);
+// System.out.println(rechargeNo);
+// }
/**
* 微信支付回调接口
*/
@@ -274,7 +281,7 @@
// resXml = AppConstance.RESULT_XML_FAIL.replace(ERRORMSG, "支付回调签名错误");
} finally {
// 通知线程消息
- PayThreadPool.notifyThread(Integer.valueOf(orderId), threadResult);
+// PayThreadPool.notifyThread(Integer.valueOf(orderId), threadResult);
sendResultBack(response, resXml);
}
return;
--
Gitblit v1.9.1