Merge branch 'dev_order' into test6.8.2

@@ -558,6 +558,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
 		String message = type.getName();
 		// 使用钱包余额，支付保证金
 		SellerWallet sw = sellerWalletMapper.selectByUidAndType(uid, 1);
+		logger.info("{}修改钱包表入口，uid={}，钱包={}", type.getName(), uid, sw);
 		if (sw == null) {
 			logger.error(message + "失败，钱包不存在，uid={}", uid);
 			CommonAlarmEventPublisher.publish(message + "失败", "ufo.order.changePrice", "钱包不存在uid=" + uid+", 金额为："+money);