Merge branch 'dev-detectnotpass' into hotfix-20190826

@@ -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.getName(), orderCode, uid, money);
+		logger.info("{}修改钱包表入口，orderCode={}，uid={}，money={},type={}", type.getName(), orderCode, uid, money, type);
 		String message = type.getName();
 		// 使用钱包余额，支付保证金
 		SellerWallet sw = sellerWalletMapper.selectByUidAndType(uid, 1);