Merge branch 'dev6.8.6' into test6.8.6

@@ -1191,7 +1191,7 @@ public class PaymentServiceImpl implements IPaymentService {
                 // 退剩余保证金
                 BigDecimal backEarnestMoney = penaltyResult.getLeftAmount();
                 try {
-                    tradeBillsService.backPayEnsureRecord(sellerUid, skup, sellerOrder.getOrderCode(), sellerOrder.getPayment(), BillTradeStatus.FAIL.getCode(), backEarnestMoney, meta);
+                    tradeBillsService.backPayEnsureRecord(sellerOrder, BillTradeStatus.FAIL.getCode(), backEarnestMoney, meta);
                 } catch (Exception e) {
                     logger.warn("返回剩余保证金失败, sellerUid is {}, skup is {}, err is {}", sellerUid, skup, e.getMessage());
                 }

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.yohoufo.dal.order.SellerOrderMetaMapper;
 import com.yohoufo.dal.order.TradeBillsMapper;
+import com.yohoufo.dal.order.model.SellerOrder;
 import com.yohoufo.dal.order.model.SellerOrderMeta;
 import com.yohoufo.dal.order.model.TradeBills;
 import com.yohoufo.order.common.Payment;
@@ -38,14 +39,17 @@ public class TradeBillsService {
      * @param payType
      * @param tradeStatus
      */
-    public void backPayEnsureRecord(Integer uid, Integer skup, Long orderCode,
-                                    Integer payType, Integer tradeStatus) {
+    public void backPayEnsureRecord(Integer uid, Integer skup, Long orderCode, Integer payType, Integer tradeStatus) {
         backPayEnsureRecord(uid, skup, orderCode, payType, tradeStatus, null, null);
     }
 
-    public void backPayEnsureRecord(Integer uid, Integer skup, Long orderCode,
-                                    Integer payType, Integer tradeStatus,
-                                    BigDecimal backEarnestMoney, SellerOrderMeta meta) {
+    public void backPayEnsureRecord(SellerOrder sellerOrder, Integer tradeStatus, BigDecimal backEarnestMoney, SellerOrderMeta meta) {
+        backPayEnsureRecord(sellerOrder.getUid(), sellerOrder.getSkup(), sellerOrder.getOrderCode(), sellerOrder.getPayment(), tradeStatus, backEarnestMoney, meta);
+    }
+
+    private void backPayEnsureRecord(Integer uid, Integer skup, Long orderCode, Integer payType,
+                                     Integer tradeStatus,
+                                     BigDecimal backEarnestMoney, SellerOrderMeta meta) {
         if (payType != null && Payment.WALLET.getCode() == payType) {
             return;
         }