|
@@ -19,11 +19,13 @@ import com.txz.cif.dto.Result;
|
|
|
import com.txz.cif.dto.tfpay.TFWithdrawDTO;
|
|
import com.txz.cif.dto.tfpay.TFWithdrawDTO;
|
|
|
import com.txz.cif.enums.AccountFreezdTypeEnum;
|
|
import com.txz.cif.enums.AccountFreezdTypeEnum;
|
|
|
import com.txz.cif.enums.BizTypeEnum;
|
|
import com.txz.cif.enums.BizTypeEnum;
|
|
|
-import com.txz.cif.model.*;
|
|
|
|
|
-import com.txz.cif.web.para.FreezdParam;
|
|
|
|
|
|
|
+import com.txz.cif.model.BizLog;
|
|
|
|
|
+import com.txz.cif.model.PaymentChannel;
|
|
|
|
|
+import com.txz.cif.model.User;
|
|
|
|
|
+import com.txz.cif.model.WithdrawRecord;
|
|
|
import com.txz.cif.param.WithdrawParam;
|
|
import com.txz.cif.param.WithdrawParam;
|
|
|
import com.txz.cif.service.*;
|
|
import com.txz.cif.service.*;
|
|
|
-import com.txz.cif.util.TFPayUtil;
|
|
|
|
|
|
|
+import com.txz.cif.web.para.FreezdParam;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -32,7 +34,6 @@ import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
-import java.util.Map;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -112,7 +113,7 @@ public class WithdrawRecordServiceImpl extends AbstractService<WithdrawRecord> i
|
|
|
.payMemberid(paymentChannel.getMerchantNum())
|
|
.payMemberid(paymentChannel.getMerchantNum())
|
|
|
.payOrderid(thirdOrderNo)
|
|
.payOrderid(thirdOrderNo)
|
|
|
.payApplydate(now.toString())
|
|
.payApplydate(now.toString())
|
|
|
- // 如需测试改成502
|
|
|
|
|
|
|
+ // fixme 如需测试改成502
|
|
|
// .payChannelcode("502")
|
|
// .payChannelcode("502")
|
|
|
.payChannelcode(getPayChannelcode(w.getBank(),paymentChannel))
|
|
.payChannelcode(getPayChannelcode(w.getBank(),paymentChannel))
|
|
|
.payNotifyurl(paymentChannel.getWithdrawNotifyUrl())
|
|
.payNotifyurl(paymentChannel.getWithdrawNotifyUrl())
|