From d52e728dc411aa8e43d37bda9f85bfc09871c1a0 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 19 七月 2025 16:14:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java
index 82c3236..facfcc1 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java
@@ -1,6 +1,5 @@
package com.doumee.service.business.impl;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.doumee.config.wx.TransferToUser;
import com.doumee.config.wx.WXPayUtility;
@@ -210,7 +209,6 @@
transferToUserRequest.outBillNo = withdrawalOrders.getOutBillNo();
transferToUserRequest.transferAmount = withdrawalDTO.getAmount();
transferToUserRequest.transferRemark = "鎻愮幇鐢宠";
-// transferToUserRequest.userName = member.getName();
try {
TransferToUser.TransferToUserResponse response = WxMiniConfig.transferToUser.run(transferToUserRequest,member.getName());
withdrawalOrders.setRemark(JSONObject.toJSONString(response));
@@ -224,6 +222,8 @@
//瀛樺偍娴佹按璁板綍
MemberRevenue memberRevenue = new MemberRevenue();
memberRevenue.setCreateTime(new Date());
+ memberRevenue.setTransactionNo(withdrawalOrders.getOutBillNo());
+ memberRevenue.setDeleted(Constants.ZERO);
memberRevenue.setMemberId(member.getId());
memberRevenue.setType(Constants.THREE);
memberRevenue.setOptType(-Constants.ONE);
@@ -231,6 +231,7 @@
memberRevenue.setAmount(withdrawalOrders.getAmount());
memberRevenue.setAfterAmount(member.getAmount() - withdrawalOrders.getAmount());
memberRevenue.setObjId(withdrawalOrders.getId());
+ memberRevenue.setRemark(Constants.RevenueType.getInfo(memberRevenue.getType()));
memberRevenue.setObjType(Constants.ONE);
memberRevenue.setDeleted(Constants.ZERO);
memberRevenue.setStatus(Constants.TWO);
--
Gitblit v1.9.3