Merge branch 'dev_order' into test6.8.2

@@ -134,6 +134,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
 				return;
 			}
 			beforeAmount = sw.getAmount();
+			sw.setLockAmount(null);
 			sw.setAmount(orderInfo.getAmount());
 			sw.setUpdateTime(TimeUtils.getTimeStampSecond());
 			logger.info("后期充值，处理总账表增加余额，bean={}", sw);