Merge branch 'dev-detectnotpass' into hotfix-20190826

wujiexiang
Commit 183c29cf524a22b145e0379f9a894991bf656d84 2 parents 76ab6899 0e2b18df
Showing 1 changed file with 2 additions and 1 deletions
order/src/main/java/com/yohoufo/order/service/MerchantOrderPaymentService.java
--- a/order/src/main/java/com/yohoufo/order/service/MerchantOrderPaymentService.java
View file @183c29c
+++ b/order/src/main/java/com/yohoufo/order/service/MerchantOrderPaymentService.java
View file @183c29c
@@ -896,7 +896,8 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
 				|| type == SellerWalletDetail.Type.APPRAISE_UNSURE
 				|| type == SellerWalletDetail.Type.BUYER_CANCEL_DELIVERY
 				|| type == SellerWalletDetail.Type.BUYER_CANCEL_NO_DELIVERY
- 				|| type == SellerWalletDetail.Type.AUDIT_FAILED) {
+ 				|| type == SellerWalletDetail.Type.AUDIT_FAILED
+ 		        || type == SellerWalletDetail.Type.DETECTION_NOT_PASS) {
 			// 增加保证金
 			availAmount = money;
 			lockAmount = money.negate();