增加ali转账

@@ -646,7 +646,7 @@ public class PaymentServiceImpl implements IPaymentService {
     }
     }
 
 
 	@Database(ForceMaster = true)
 	@Database(ForceMaster = true)
-    public boolean transAllEarnest(long orderCode, Integer uid, BigDecimal amount, String alipayAccount){
+    public boolean transAllEarnest(long orderCode, Integer uid, BigDecimal amount, String alipayId, String alipayAccount){
     	logger.info("退还商家所有保证金，转账开始，orderCode = {}, uid={}, amount={}, alipayAccount={}", orderCode, uid, amount, alipayAccount);
     	logger.info("退还商家所有保证金，转账开始，orderCode = {}, uid={}, amount={}, alipayAccount={}", orderCode, uid, amount, alipayAccount);
 
 
     	int now = (int) (System.currentTimeMillis()/1000);
     	int now = (int) (System.currentTimeMillis()/1000);
@@ -711,7 +711,7 @@ public class PaymentServiceImpl implements IPaymentService {
 		// 转账
 		// 转账
 		try {
 		try {
 			logger.info("transAllEarnest开始调用阿里接口参数buyerOrderCode={}， alipayAccount={}， transferAmount={}", orderCode, alipayAccount, amount);
 			logger.info("transAllEarnest开始调用阿里接口参数buyerOrderCode={}， alipayAccount={}， transferAmount={}", orderCode, alipayAccount, amount);
-			JSONObject jsonObject = alipayService.transferMoney(Long.toString(orderCode), null, alipayAccount, amount);
+			JSONObject jsonObject = alipayService.transferMoney(Long.toString(orderCode), alipayId, alipayAccount, amount);
 			if (jsonObject == null) {
 			if (jsonObject == null) {
 				logger.warn("transAllEarnestErr 转账失败 , orderCode is {}", orderCode);
 				logger.warn("transAllEarnestErr 转账失败 , orderCode is {}", orderCode);
 				transfer.setStatus(3);
 				transfer.setStatus(3);