hurui
/
gratia-pay-parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
yy_dev
胡锐 1 year ago
parent 1709249a6a
commit d7d48a1290
1 changed files with 14 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 40
      schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java

40
schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java
Unescape View File

@ -329,32 +329,16 @@ public class TradeOrderSchedule {
for (BsTradeOrderRefund tradeOrderRefund : tradeOrderRefundList) {
try {
// 查询手续费
JSONObject queryTrans = laKaLaTradeService.queryTradeOrderRefundTrans(tradeOrderRefund.getRefundNo());
if (queryTrans != null) {
tradeOrderRefund.setShdFeeAmt(new BigDecimal(queryTrans.getString("fee_amount").replace("-","")));
tradeOrderRefund.setSettleAmount(new BigDecimal(queryTrans.getString("settle_amount").replace(",","").replace("-","")));
tradeOrderRefund.setSettleDate(queryTrans.getDate("clear_date"));
tradeOrderRefundService.editOrderRefund(tradeOrderRefund);
// 查询交易
BsTradeOrder tradeOrder = tradeOrderService.getOrderByOutTradeNo(tradeOrderRefund.getOutTradeNo());
if (tradeOrder != null) {
if (tradeOrder.getSettleAmount() == null) {
// 查询手续费
JSONObject tradeOrderTrans = laKaLaTradeService.queryTradeOrderTrans(tradeOrder.getOutTradeNo());
if (tradeOrderTrans != null && tradeOrderTrans.getString("trade_state").equals("03")) {
tradeOrder.setShdFeeAmt(tradeOrderTrans.getBigDecimal("fee_amount"));
tradeOrder.setSettleAmount(new BigDecimal(tradeOrderTrans.getString("settle_amount").replace(",","")));
tradeOrder.setSettleDate(tradeOrderTrans.getDate("clear_date"));
tradeOrder.setFeeRate(new BigDecimal(tradeOrderTrans.getString("fee_rate").split(",")[0]));
tradeOrderService.editOrder(tradeOrder);
}
}
tradeOrder.setShdFeeAmt(tradeOrder.getShdFeeAmt().subtract(tradeOrderRefund.getShdFeeAmt()));
tradeOrder.setSettleAmount(tradeOrder.getSettleAmount().subtract(tradeOrderRefund.getSettleAmount()));
tradeOrderService.editOrder(tradeOrder);
// 查询交易
BsTradeOrder tradeOrder = tradeOrderService.getOrderByOutTradeNo(tradeOrderRefund.getOutTradeNo());
if (tradeOrder != null && tradeOrder.getSettleAmount() != null) {
// 查询手续费
JSONObject queryTrans = laKaLaTradeService.queryTradeOrderRefundTrans(tradeOrderRefund.getRefundNo());
if (queryTrans != null) {
tradeOrderRefund.setShdFeeAmt(new BigDecimal(queryTrans.getString("fee_amount").replace("-","")));
tradeOrderRefund.setSettleAmount(new BigDecimal(queryTrans.getString("settle_amount").replace(",","").replace("-","")));
tradeOrderRefund.setSettleDate(queryTrans.getDate("clear_date"));
tradeOrderRefundService.editOrderRefund(tradeOrderRefund);
BsTradeSettle tradeSettle = new BsTradeSettle();
tradeSettle.setCompanyId(tradeOrder.getCompanyId());
@ -383,6 +367,10 @@ public class TradeOrderSchedule {
tradeSettle.setFeeRate(tradeOrder.getFeeRate());
tradeSettle.setOrgOutTradeNo(tradeOrder.getOutTradeNo());
tradeSettleService.editData(tradeSettle);
tradeOrder.setShdFeeAmt(tradeOrder.getShdFeeAmt().subtract(tradeOrderRefund.getShdFeeAmt()));
tradeOrder.setSettleAmount(tradeOrder.getSettleAmount().subtract(tradeOrderRefund.getSettleAmount()));
tradeOrderService.editOrder(tradeOrder);
}
}
} catch (Exception e) {

Write Preview
Loading…
Cancel
Save