From 55ea3d5de0c128d82bbc85551b3f52b917abbd68 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 八月 2025 20:58:18 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai
---
server/services/src/main/java/com/doumee/service/business/impl/WithdrawalOrdersServiceImpl.java | 80 +++++++++++++++++++++------------------
1 files changed, 43 insertions(+), 37 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 86d9fdb..1a0dd27 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,7 @@
package com.doumee.service.business.impl;
import com.alibaba.fastjson.JSONObject;
+import com.doumee.config.wx.SendWxMessage;
import com.doumee.config.wx.TransferToUser;
import com.doumee.config.wx.WXPayUtility;
import com.doumee.config.wx.WxMiniConfig;
@@ -9,6 +10,7 @@
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.MemberRevenueMapper;
@@ -50,6 +52,9 @@
@Autowired
private MemberRevenueMapper memberRevenueMapper;
+
+ @Autowired
+ private SendWxMessage sendWxMessage;
@Override
public Integer create(WithdrawalOrders withdrawalOrders) {
@@ -249,44 +254,45 @@
@Override
public void transferSuccess(String outBillNo,Boolean isSuccess){
- //杞处鎴愬姛
- if(isSuccess){
- withdrawalOrdersMapper.update(new UpdateWrapper<WithdrawalOrders>().lambda()
- .set(WithdrawalOrders::getStatus,Constants.ONE)
- .eq(WithdrawalOrders::getOutBillNo,outBillNo)
- );
- }else {
- WithdrawalOrders withdrawalOrders = withdrawalOrdersMapper.selectOne(new QueryWrapper<WithdrawalOrders>().lambda()
- .eq(WithdrawalOrders::getOutBillNo,outBillNo).last("limit 1"));
- if(Objects.isNull(withdrawalOrders)){
- return;
- }
- Member member = memberMapper.selectById(withdrawalOrders.getMemberId());
- if(Objects.isNull(member)){
- return;
- }
- //鏇存柊鐢ㄦ埛浣欓
- memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" AMOUNT = AMOUNT + " + withdrawalOrders.getAmount() ).eq(Member::getId,withdrawalOrders.getMemberId()));
-
- //瀛樺偍娴佹按璁板綍
- MemberRevenue memberRevenue = new MemberRevenue();
- memberRevenue.setCreateTime(new Date());
- memberRevenue.setTransactionNo(withdrawalOrders.getOutBillNo());
- memberRevenue.setDeleted(Constants.ZERO);
- memberRevenue.setMemberId(withdrawalOrders.getMemberId());
- memberRevenue.setType(Constants.FOUR);
- memberRevenue.setOptType(Constants.ONE);
- memberRevenue.setBeforeAmount(member.getAmount());
- 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.ZERO);
- memberRevenueMapper.insert(memberRevenue);
-
+ WithdrawalOrders withdrawalOrders = withdrawalOrdersMapper.selectOne(new QueryWrapper<WithdrawalOrders>().lambda()
+ .eq(WithdrawalOrders::getOutBillNo,outBillNo).last("limit 1"));
+ Member member = memberMapper.selectById(withdrawalOrders.getMemberId());
+ if(Objects.isNull(member)){
+ return;
}
+ if(Objects.nonNull(withdrawalOrders)){
+ //杞处鎴愬姛
+ if(isSuccess){
+ withdrawalOrdersMapper.update(new UpdateWrapper<WithdrawalOrders>().lambda()
+ .set(WithdrawalOrders::getStatus,Constants.ONE)
+ .set(WithdrawalOrders::getUpdateTime, DateUtil.getCurrDateTime())
+ .eq(WithdrawalOrders::getOutBillNo,outBillNo)
+ );
+ withdrawalOrders.setUpdateTime(new Date());
+ sendWxMessage.withdrawalMessage(member.getOpenid(),withdrawalOrders);
+ }else {
+ //鏇存柊鐢ㄦ埛浣欓
+ memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" AMOUNT = AMOUNT + " + withdrawalOrders.getAmount() ).eq(Member::getId,withdrawalOrders.getMemberId()));
+ //瀛樺偍娴佹按璁板綍
+ MemberRevenue memberRevenue = new MemberRevenue();
+ memberRevenue.setCreateTime(new Date());
+ memberRevenue.setTransactionNo(withdrawalOrders.getOutBillNo());
+ memberRevenue.setDeleted(Constants.ZERO);
+ memberRevenue.setMemberId(withdrawalOrders.getMemberId());
+ memberRevenue.setType(Constants.FOUR);
+ memberRevenue.setOptType(Constants.ONE);
+ memberRevenue.setBeforeAmount(member.getAmount());
+ 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.ZERO);
+ memberRevenueMapper.insert(memberRevenue);
+ }
+ }
+
}
@Override
--
Gitblit v1.9.3