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

Merge branch 'pre' into sxf

Browse Source
yy_dev
胡锐 1 year ago
parent ff694fb5e9 24ba0a8a2f
commit 86846f0ede
2 changed files with 26 additions and 32 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. 44
      schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java
  2. 14
      service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java

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

@ -258,12 +258,12 @@ public class TradeOrderSchedule {
@Scheduled(cron="0 0/1 * * * ?")
public void tradeOrderSettle() {
Map<String, Object> param = new HashMap<>();
param.put("status", "3");
param.put("statusList", "3,6");
param.put("settleAmountIsNull", true);
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_MONTH, -2);
param.put("payTimeS", calendar.getTimeInMillis());
param.put("payTimeS", calendar.getTimeInMillis());
List<BsTradeOrder> tradeOrderList = tradeOrderService.getTradeOrderList(param);
for (BsTradeOrder tradeOrder : tradeOrderList) {
@ -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) {

14
service/src/main/java/com/hfkj/service/impl/BsTradeOrderServiceImpl.java
Unescape View File

@ -24,10 +24,7 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@Service("tradeOrderService")
public class BsTradeOrderServiceImpl implements BsTradeOrderService {
@ -405,6 +402,15 @@ public class BsTradeOrderServiceImpl implements BsTradeOrderService {
criteria.andStatusEqualTo(MapUtils.getInteger(param, "status"));
}
if (StringUtils.isNotBlank(MapUtils.getString(param, "statusList"))) {
String[] statusLists = MapUtils.getString(param, "statusList").split(",");
List<Integer> statusList = new ArrayList<>();
for (String s : statusLists) {
statusList.add(Integer.parseInt(s));
}
criteria.andStatusIn(statusList);
}
if (StringUtils.isNotBlank(MapUtils.getString(param, "settleAmountIsNull"))) {
criteria.andSettleAmountIsNull();
}

Write Preview
Loading…
Cancel
Save