bug修改

@@ -101,6 +101,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
 
 		BigDecimal amount = orderInfo.getAmount();
 		BigDecimal beforeAmount = BigDecimal.ZERO;
+		BigDecimal beforeLockAmount = BigDecimal.ZERO;
 		SellerWallet sw = sellerWalletMapper.selectByUidAndType(orderInfo.getUid(), 1);
 		logger.info("充值后回调，处理总账表，orderCode={}", orderInfo.getOrderCode());
 		if (orderInfo.getType() == TYPE_FIRST_RECHARGE) {
@@ -134,6 +135,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
 				return;
 			}
 			beforeAmount = sw.getAmount();
+			beforeLockAmount = sw.getLockAmount();
 			sw.setLockAmount(null);
 			sw.setAmount(orderInfo.getAmount());
 			sw.setUpdateTime(TimeUtils.getTimeStampSecond());
@@ -162,7 +164,7 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
     		swd.setLockAmount(BigDecimal.ZERO);
     	} else {
     		swd.setAvailAmount(orderInfo.getAmount().add(beforeAmount));
-    		swd.setLockAmount(sw.getLockAmount());
+    		swd.setLockAmount(beforeLockAmount);
     	}
     	swd.setIsSet(1);
     	MerchantOrderAttachInfo att = new MerchantOrderAttachInfo();