Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、账户明细补充购买订单号；2、支付单补充外部支付单号；

Browse Source
This commit is contained in:
gaoqr
2025-10-17 15:50:40 +08:00
parent 439db39fa3
commit 5d63fa89a1
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/incomeandexpense/IncomeExpenseServiceImpl.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class IncomeExpenseServiceImpl implements IncomeExpenseService {
respVO.setRechargePayAmount(i.getExternalSpent()); respVO.setRechargePayAmount(i.getExternalSpent());
respVO.setGiftPayAmount(i.getGiftMoneySpent()); respVO.setGiftPayAmount(i.getGiftMoneySpent());
respVO.setPaymentMethod(PayProductChannelCodeEnumNew.describe(i.getPaymentMethod())); respVO.setPaymentMethod(PayProductChannelCodeEnumNew.describe(i.getPaymentMethod()));
respVO.setOrderNo(String.valueOf(i.getPurchaseId())); respVO.setOrderNo(ObjectUtil.isNotNull(i.getPurchaseId()) ? String.valueOf(i.getPurchaseId()) : null);
} else if (TradeTypeEnum.MANUAL_ADJUST.getCode().equals(tradeType)) { } else if (TradeTypeEnum.MANUAL_ADJUST.getCode().equals(tradeType)) {
respVO.setRechargeAmount(i.getCashAmountChange()); respVO.setRechargeAmount(i.getCashAmountChange());
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/pay/PayOrderServiceImpl.java
+1
View File
@@ -509,6 +509,7 @@ public class PayOrderServiceImpl implements PayOrderService {
String subject = payOrderDO.getSubject(); String subject = payOrderDO.getSubject();
payOrderUnifiedReqDTO.setSubject(subject); payOrderUnifiedReqDTO.setSubject(subject);
payOrderUnifiedReqDTO.setBody(subject); payOrderUnifiedReqDTO.setBody(subject);
payOrderUnifiedReqDTO.setOutTradeNo(String.valueOf(payOrderDO.getId()));
payOrderUnifiedReqDTO.setPrice(payOrderDO.getPrice()); payOrderUnifiedReqDTO.setPrice(payOrderDO.getPrice());
payOrderUnifiedReqDTO.setExpireTime(payOrderDO.getExpireTime()); payOrderUnifiedReqDTO.setExpireTime(payOrderDO.getExpireTime());
payOrderUnifiedReqDTO.setNotifyUrl(String.format(alipayConfig.getNotifyUrl(), payOrderDO.getChannelCode().getCode())); payOrderUnifiedReqDTO.setNotifyUrl(String.format(alipayConfig.getNotifyUrl(), payOrderDO.getChannelCode().getCode()));
cf-module-system/cf-module-system-biz/src/main/resources/mapper/funds/incomeandexpense/IncomeExpenseDetailsMapper.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.cf.imes.module.system.dal.mysql.incomeandexpense.IncomeExpenseDetailsMapper"> <mapper namespace="com.cf.imes.module.system.dal.mysql.incomeandexpense.IncomeExpenseDetailsMapper">
<select id="getAccountDetailsPage" resultType="com.cf.imes.module.system.dal.dataobject.incomeandexpense.AccountDetailsDO"> <select id="getAccountDetailsPage" resultType="com.cf.imes.module.system.dal.dataobject.incomeandexpense.AccountDetailsDO">
select i.id, i.business_no, i.order_no ,i.trade_type , i.income_expense_type, i.cash_amount_change, i.gift_amount_change, i.creator, i.create_time, i.organ_id , select i.id, i.business_no, i.order_no ,i.trade_type , i.income_expense_type, i.cash_amount_change, i.gift_amount_change, i.creator, i.create_time, i.organ_id ,i.purchase_id,
p.total_amount, p.external_spent, p.account_balance_spent, p.gift_money_spent, p.payment_method, o.channel_code p.total_amount, p.external_spent, p.account_balance_spent, p.gift_money_spent, p.payment_method, o.channel_code
from income_expense_details i from income_expense_details i
left join purchase_record p on i.purchase_id = p.id left join purchase_record p on i.purchase_id = p.id