Merge branch 'master' into sxf

schedule/src/main/java/com/hfkj/schedule/TradeOrderSchedule.java

@@ -366,6 +366,7 @@ public class TradeOrderSchedule {
                     JSONObject queryTrans = tianQueTradeService.poundageQuery(tradeOrder.getPlatformMerNo(), tradeOrder.getOutTradeNo());
                     tradeOrder.setShdFeeAmt(queryTrans.getBigDecimal("recFeeAmt"));
                     tradeOrder.setFeeRate(new BigDecimal(queryTrans.getString("recFeeRate")));
+                    tradeOrder.setSettleAmount(tradeOrder.getSettleAmount().subtract(tradeOrder.getShdFeeAmt()));
                     tradeOrderService.editOrder(tradeOrder);
 
                     BsTradeSettle tradeSettle = new BsTradeSettle();