资金明细新增附件
parent
17b5476c03
commit
9f030ddee7
|
|
@ -79,6 +79,11 @@ public class MoneyChangeDetailEntity {
|
||||||
*/
|
*/
|
||||||
private MoneyChangeCategory moneyChangeCategory;
|
private MoneyChangeCategory moneyChangeCategory;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 附件地址
|
||||||
|
*/
|
||||||
|
private String fileUrl;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 扩展信息
|
* 扩展信息
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 资金账户表
|
* 资金账户表
|
||||||
|
* @author ljw
|
||||||
*/
|
*/
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
|
|
@ -54,8 +55,10 @@ public class MoneyAccountService extends ServiceImpl<MoneyAccountMapper, MoneyAc
|
||||||
MoneyChangeDetailEntity changeDetail = new MoneyChangeDetailEntity()
|
MoneyChangeDetailEntity changeDetail = new MoneyChangeDetailEntity()
|
||||||
.setMoneyAccountId(moneyAccountEntity.getId())
|
.setMoneyAccountId(moneyAccountEntity.getId())
|
||||||
.setOldMoney(result.getMoney())
|
.setOldMoney(result.getMoney())
|
||||||
.setDelta(moneyAccountEntity.getRechargeMoney()) // 充值
|
// 充值
|
||||||
|
.setDelta(moneyAccountEntity.getRechargeMoney())
|
||||||
.setMoneyChangeCategory(MoneyChangeCategory.ChongZhi)
|
.setMoneyChangeCategory(MoneyChangeCategory.ChongZhi)
|
||||||
|
.setFileUrl(moneyAccountEntity.getFileUrl())
|
||||||
.setMemo("账户充值");
|
.setMemo("账户充值");
|
||||||
|
|
||||||
moneyAccountEntity.setMoney(result.getMoney().add(moneyAccountEntity.getRechargeMoney()));
|
moneyAccountEntity.setMoney(result.getMoney().add(moneyAccountEntity.getRechargeMoney()));
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ public class WeChatPayServiceImpl implements WeChatPayService {
|
||||||
* @return 订单查询结果
|
* @return 订单查询结果
|
||||||
* @throws WxPayException 微信支付异常
|
* @throws WxPayException 微信支付异常
|
||||||
*/
|
*/
|
||||||
|
@Override
|
||||||
public WxPayOrderQueryResult queryOrder(String outTradeNo) throws WxPayException {
|
public WxPayOrderQueryResult queryOrder(String outTradeNo) throws WxPayException {
|
||||||
try {
|
try {
|
||||||
log.info("开始查询微信支付订单,商户订单号:{}", outTradeNo);
|
log.info("开始查询微信支付订单,商户订单号:{}", outTradeNo);
|
||||||
|
|
@ -58,6 +59,7 @@ public class WeChatPayServiceImpl implements WeChatPayService {
|
||||||
* @param outTradeNo 商户订单号
|
* @param outTradeNo 商户订单号
|
||||||
* @throws WxPayException 微信支付异常
|
* @throws WxPayException 微信支付异常
|
||||||
*/
|
*/
|
||||||
|
@Override
|
||||||
public void closeOrder(String outTradeNo) throws WxPayException {
|
public void closeOrder(String outTradeNo) throws WxPayException {
|
||||||
try {
|
try {
|
||||||
log.info("开始关闭微信支付订单,商户订单号:{}", outTradeNo);
|
log.info("开始关闭微信支付订单,商户订单号:{}", outTradeNo);
|
||||||
|
|
@ -80,6 +82,7 @@ public class WeChatPayServiceImpl implements WeChatPayService {
|
||||||
* @return 退款结果
|
* @return 退款结果
|
||||||
* @throws WxPayException 微信支付异常
|
* @throws WxPayException 微信支付异常
|
||||||
*/
|
*/
|
||||||
|
@Override
|
||||||
public String refund(String outTradeNo, String outRefundNo, int totalFee, int refundFee, String notifyUrl) throws WxPayException {
|
public String refund(String outTradeNo, String outRefundNo, int totalFee, int refundFee, String notifyUrl) throws WxPayException {
|
||||||
try {
|
try {
|
||||||
log.info("开始申请微信支付退款,商户订单号:{},退款单号:{},退款金额:{},退款回调地址:{}", outTradeNo,
|
log.info("开始申请微信支付退款,商户订单号:{},退款单号:{},退款金额:{},退款回调地址:{}", outTradeNo,
|
||||||
|
|
@ -101,4 +104,4 @@ public class WeChatPayServiceImpl implements WeChatPayService {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
mcd.delta,
|
mcd.delta,
|
||||||
mcd.new_money,
|
mcd.new_money,
|
||||||
mcd.money_change_category,
|
mcd.money_change_category,
|
||||||
|
mcd.file_url,
|
||||||
mcd.extend_info,
|
mcd.extend_info,
|
||||||
mcd.memo,
|
mcd.memo,
|
||||||
mcd.company_id,
|
mcd.company_id,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue