Merge branch 'dev-detectnotpass' into hotfix-20190826

@@ -55,7 +55,7 @@ public class SellerWalletDetail {
     	BUYER_CANCEL_DELIVERY("买家取消（有物流）", 42),
 		APPRAISE_OK("鉴定通过", 51),
 		APPRAISE_UNSURE("商品无法鉴定", 52),
-		DETECTION_NOT_PASS("商品检测不通过", 53),
+		DETECTION_NOT_PASS("商品检测不通过", 54),
     	MERCHANT_EXIT("商家退出入驻", 61),
 		CANCEL_DELIVER("不寄了", 71),
 		FLAW("瑕疵品",72);

@@ -963,7 +963,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
 									   MerchantOrderAttachInfo attach, SellerWalletDetail.Type type) {
     	Supplier<Object[]> logSuppplier = ()-> new Object[]{type.getName(), orderCode, uid};
 		money = fixMoneyScale(money, logSuppplier);
-		logger.info("{}修改钱包表入口，orderCode={}，uid={}，money={},type={}", type.getName(), orderCode, uid, money, type);
+		logger.info("{}修改钱包表入口，orderCode={}，uid={}，money={}", type.getName(), orderCode, uid, money);
 		String message = type.getName();
 		// 使用钱包余额，支付保证金
 		SellerWallet sw = sellerWalletMapper.selectByUidAndType(uid, 1);

@@ -42,7 +42,6 @@ public class WalletPayService extends AbstractPayService {
 
 
     public PayRefundBo refundOpenApi(PayRefundBo refundBo) {
-        logger.info("refundOpenApi,type:{}",refundBo.getAttach().getType());
         try {
             SellerWalletDetail.Type type = SellerWalletDetail.Type.of(refundBo.getAttach().getType());
             BigDecimal amount = new BigDecimal(Double.toString(refundBo.getAmount()));