This commit is contained in:
2023-07-10 17:06:19 +08:00
parent 0c95333234
commit c74181e584
6 changed files with 35 additions and 13 deletions

View File

@@ -62,4 +62,6 @@ public interface IAdapayMemberAccountService {
AdapayMemberAccount selectByMerchantId(String merchantId);
String selectAdapayMemberIdByStationId(String stationId);
void deleteByMemberId(String memberId);
}

View File

@@ -126,4 +126,9 @@ public class AdapayMemberAccountServiceImpl implements IAdapayMemberAccountServi
}
return adapayMemberAccount.getAdapayMemberId();
}
@Override
public void deleteByMemberId(String memberId) {
adapayMemberAccountMapper.deleteByMemberId(memberId);
}
}

View File

@@ -17,7 +17,6 @@ import com.huifu.adapay.model.Refund;
import com.jsowell.adapay.common.CreateAdaPaymentParam;
import com.jsowell.common.constant.CacheConstants;
import com.jsowell.common.constant.Constants;
import com.jsowell.common.core.domain.entity.SysDictData;
import com.jsowell.common.core.domain.vo.AuthorizedDeptVO;
import com.jsowell.common.core.domain.ykc.RealTimeMonitorData;
import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
@@ -95,6 +94,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
@Value("${adapay.callback}")
private String ADAPAY_CALLBACK_URL;
@Value("${adapay.refundCallback}")
private String ADAPAY_REFUND_CALLBACK_URL;
@Autowired
private WxAppletRemoteService wxAppletRemoteService;
@@ -146,9 +148,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
@Autowired
private IMemberPlateNumberRelationService memberPlateNumberRelationService;
@Value("${adapay.refundCallback}")
private String ADAPAY_REFUND_CALLBACK_URL;
@Autowired
private IMemberTransactionRecordService memberTransactionRecordService;
@@ -1950,7 +1949,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
Map<String, Object> refundParams = Maps.newHashMap();
refundParams.put("refund_amt", amount);
refundParams.put("refund_order_no", snowflakeId);
refundParams.put("notify_url", ADAPAY_REFUND_CALLBACK_URL);
refundParams.put("notify_url", ADAPAY_CALLBACK_URL);
try {
Map<String, Object> response = Refund.create(id, refundParams);
logger.info("汇付支付创建退款对象:{}", JSON.toJSONString(response));
@@ -1964,6 +1963,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
reverseParams.put("payment_id", id);
reverseParams.put("reverse_amt", amount);
reverseParams.put("order_no", snowflakeId);
reverseParams.put("notify_url", ADAPAY_CALLBACK_URL);
try {
Map<String, Object> paymentReverse = PaymentReverse.create(reverseParams);
logger.info("汇付支付创建交易撤销对象:{}", JSON.toJSONString(paymentReverse));