From 0cfbaf9a439dc75824c52a6e58b6849064afbc80 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期六, 19 七月 2025 10:32:38 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java | 3 +-- 1 files changed, 1 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..ef8c562 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)); @@ -231,6 +229,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