ufo / yohoufo-fore · Commits

Go to a project

Authored by wujiexiang
Commit 183c29cf524a22b145e0379f9a894991bf656d84 2 parents 76ab6899 0e2b18df

Merge branch 'dev-detectnotpass' into hotfix-20190826

Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
@@ -896,7 +896,8 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService { @@ -896,7 +896,8 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
896 || type == SellerWalletDetail.Type.APPRAISE_UNSURE 896 || type == SellerWalletDetail.Type.APPRAISE_UNSURE
897 || type == SellerWalletDetail.Type.BUYER_CANCEL_DELIVERY 897 || type == SellerWalletDetail.Type.BUYER_CANCEL_DELIVERY
898 || type == SellerWalletDetail.Type.BUYER_CANCEL_NO_DELIVERY 898 || type == SellerWalletDetail.Type.BUYER_CANCEL_NO_DELIVERY
899 - || type == SellerWalletDetail.Type.AUDIT_FAILED) { 899 + || type == SellerWalletDetail.Type.AUDIT_FAILED
  900 + || type == SellerWalletDetail.Type.DETECTION_NOT_PASS) {
900 // 增加保证金 901 // 增加保证金
901 availAmount = money; 902 availAmount = money;
902 lockAmount = money.negate(); 903 lockAmount = money.negate();