Skip to content

C
clx-performance
提交 0fadcb00 authored 作者: liuhaiquan's avatar liuhaiquan
浏览文件
操作

Merge branch 'v10.7_borrowing_and_repayment_20240118' of…

Merge branch 'v10.7_borrowing_and_repayment_20240118' of https://t.clxkj.cn/clx-java/clx-performance into v10.7_borrowing_and_repayment_20240118
上级 eca432f3 ef98da5a
显示空白字符变更
内嵌 并排
正在显示 包含 217 行增加 和 100 行删除
performance-api/src/main/java/com/clx/performance/enums/nbbank/NbBankRecordEnum.java
浏览文件 @ 0fadcb00
......@@ -16,6 +16,7 @@ public enum NbBankRecordEnum {
UNION_PAY_DIRECT_ORDER(2, "银联订单支付收款模式"),
QUERY_ORDER(3, "交易结果查询"),
NOTIFY_MERCHANT(4, "异步通知交易结果"),
FUND_TRANSFER_ORDER(5, "云账簿资金划转"),
;
private final Integer code;
......
performance-api/src/main/java/com/clx/performance/param/pc/borrower/BorrowerAddParam.java → performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/BorrowerAddParam.java
浏览文件 @ 0fadcb00
package com.clx.performance.param.pc.borrower;
package com.clx.performance.param.pc.loan.carrier;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
......
performance-api/src/main/java/com/clx/performance/param/pc/borrower/BorrowerConfigAddParam.java → performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/BorrowerConfigAddParam.java
浏览文件 @ 0fadcb00
package com.clx.performance.param.pc.borrower;
package com.clx.performance.param.pc.loan.carrier;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
......
performance-api/src/main/java/com/clx/performance/param/pc/borrower/BorrowerConfigDeleteUpdateParam.java → performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/BorrowerConfigDeleteUpdateParam.java
浏览文件 @ 0fadcb00
package com.clx.performance.param.pc.borrower;
package com.clx.performance.param.pc.loan.carrier;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
......
performance-api/src/main/java/com/clx/performance/param/pc/borrower/BorrowerConfigStatusUpdateParam.java → performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/BorrowerConfigStatusUpdateParam.java
浏览文件 @ 0fadcb00
package com.clx.performance.param.pc.borrower;
package com.clx.performance.param.pc.loan.carrier;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
......
performance-api/src/main/java/com/clx/performance/param/pc/borrower/BorrowerConfigUpdateParam.java → performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/BorrowerConfigUpdateParam.java
浏览文件 @ 0fadcb00
package com.clx.performance.param.pc.borrower;
package com.clx.performance.param.pc.loan.carrier;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
......
performance-api/src/main/java/com/clx/performance/param/pc/borrower/BorrowerDeleteUpdateParam.java → performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/BorrowerDeleteUpdateParam.java
浏览文件 @ 0fadcb00
package com.clx.performance.param.pc.borrower;
package com.clx.performance.param.pc.loan.carrier;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
......
performance-api/src/main/java/com/clx/performance/param/pc/borrower/BorrowerStatusUpdateParam.java → performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/BorrowerStatusUpdateParam.java
浏览文件 @ 0fadcb00
package com.clx.performance.param.pc.borrower;
package com.clx.performance.param.pc.loan.carrier;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
......
performance-api/src/main/java/com/clx/performance/param/pc/borrower/BorrowerUpdateParam.java → performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/BorrowerUpdateParam.java
浏览文件 @ 0fadcb00
package com.clx.performance.param.pc.borrower;
package com.clx.performance.param.pc.loan.carrier;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
......
performance-api/src/main/java/com/clx/performance/param/pc/borrower/PageBorrowerConfigParam.java → performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/PageBorrowerConfigParam.java
浏览文件 @ 0fadcb00
package com.clx.performance.param.pc.borrower;
package com.clx.performance.param.pc.loan.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
......
performance-api/src/main/java/com/clx/performance/param/pc/borrower/PageBorrowerParam.java → performance-api/src/main/java/com/clx/performance/param/pc/loan/carrier/PageBorrowerParam.java
浏览文件 @ 0fadcb00
package com.clx.performance.param.pc.borrower;
package com.clx.performance.param.pc.loan.carrier;
import com.msl.common.base.PageParam;
import io.swagger.annotations.ApiModelProperty;
......
performance-api/src/main/java/com/clx/performance/vo/pc/borrower/BorrowerConfigVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/BorrowerConfigVO.java
浏览文件 @ 0fadcb00
package com.clx.performance.vo.pc.borrower;
package com.clx.performance.vo.pc.loan.carrier;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......
performance-api/src/main/java/com/clx/performance/vo/pc/borrower/BorrowerVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/BorrowerVO.java
浏览文件 @ 0fadcb00
package com.clx.performance.vo.pc.borrower;
package com.clx.performance.vo.pc.loan.carrier;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
......
performance-web/src/main/java/com/clx/performance/controller/pc/borrower/carrier/CarrierBorrowerConfigController.java → performance-web/src/main/java/com/clx/performance/controller/pc/loan/carrier/CarrierBorrowerConfigController.java
浏览文件 @ 0fadcb00
package com.clx.performance.controller.pc.borrower.carrier;
package com.clx.performance.controller.pc.loan.carrier;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.pc.borrower.*;
import com.clx.performance.service.borrower.BorrowerConfigService;
import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
import com.clx.performance.vo.pc.borrower.BorrowerVO;
import com.clx.performance.param.pc.loan.carrier.*;
import com.clx.performance.service.loan.BorrowerConfigService;
import com.clx.performance.vo.pc.loan.carrier.BorrowerConfigVO;
import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert;
import com.msl.common.result.Result;
......
performance-web/src/main/java/com/clx/performance/controller/pc/borrower/carrier/CarrierBorrowerController.java → performance-web/src/main/java/com/clx/performance/controller/pc/loan/carrier/CarrierBorrowerController.java
浏览文件 @ 0fadcb00
package com.clx.performance.controller.pc.borrower.carrier;
package com.clx.performance.controller.pc.loan.carrier;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.pc.borrower.*;
import com.clx.performance.service.borrower.BorrowerService;
import com.clx.performance.service.impl.borrower.BorrowerServiceImpl;
import com.clx.performance.vo.pc.borrower.BorrowerVO;
import com.clx.performance.param.pc.loan.carrier.*;
import com.clx.performance.service.loan.BorrowerService;
import com.clx.performance.vo.pc.loan.carrier.BorrowerVO;
import com.msl.common.base.PageData;
import com.msl.common.convertor.aspect.UnitCovert;
import com.msl.common.result.Result;
......
performance-web/src/main/java/com/clx/performance/dao/impl/borrower/BorrowerConfigDaoImpl.java → performance-web/src/main/java/com/clx/performance/dao/impl/loan/BorrowerConfigDaoImpl.java
浏览文件 @ 0fadcb00
package com.clx.performance.dao.impl.borrower;
package com.clx.performance.dao.impl.loan;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.borrower.BorrowerConfigDao;
import com.clx.performance.dao.loan.BorrowerConfigDao;
import com.clx.performance.enums.borrower.BorrowerConfigEnum;
import com.clx.performance.enums.borrower.BorrowerEnum;
import com.clx.performance.mapper.borrower.BorrowerConfigMapper;
import com.clx.performance.model.borrower.Borrower;
import com.clx.performance.model.borrower.BorrowerConfig;
import com.clx.performance.param.pc.borrower.PageBorrowerConfigParam;
import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
import com.clx.performance.vo.pc.borrower.BorrowerVO;
import com.clx.performance.mapper.loan.BorrowerConfigMapper;
import com.clx.performance.model.loan.BorrowerConfig;
import com.clx.performance.param.pc.loan.carrier.PageBorrowerConfigParam;
import com.clx.performance.vo.pc.loan.carrier.BorrowerConfigVO;
import com.msl.common.base.Optional;
import com.msl.common.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Repository;
......
performance-web/src/main/java/com/clx/performance/dao/impl/borrower/BorrowerDaoImpl.java → performance-web/src/main/java/com/clx/performance/dao/impl/loan/BorrowerDaoImpl.java
浏览文件 @ 0fadcb00
package com.clx.performance.dao.impl.borrower;
package com.clx.performance.dao.impl.loan;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.dao.borrower.BorrowerDao;
import com.clx.performance.dao.loan.BorrowerDao;
import com.clx.performance.enums.borrower.BorrowerEnum;
import com.clx.performance.mapper.borrower.BorrowerMapper;
import com.clx.performance.model.borrower.Borrower;
import com.clx.performance.param.pc.borrower.PageBorrowerParam;
import com.clx.performance.vo.pc.borrower.BorrowerVO;
import com.clx.performance.mapper.loan.BorrowerMapper;
import com.clx.performance.model.loan.Borrower;
import com.clx.performance.param.pc.loan.carrier.PageBorrowerParam;
import com.clx.performance.vo.pc.loan.carrier.BorrowerVO;
import com.msl.common.base.Optional;
import com.msl.common.dao.impl.BaseDaoImpl;
import org.springframework.stereotype.Repository;
......
performance-web/src/main/java/com/clx/performance/dao/borrower/BorrowerConfigDao.java → performance-web/src/main/java/com/clx/performance/dao/loan/BorrowerConfigDao.java
浏览文件 @ 0fadcb00
package com.clx.performance.dao.borrower;
package com.clx.performance.dao.loan;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.mapper.borrower.BorrowerConfigMapper;
import com.clx.performance.model.borrower.BorrowerConfig;
import com.clx.performance.param.pc.borrower.PageBorrowerConfigParam;
import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
import com.clx.performance.mapper.loan.BorrowerConfigMapper;
import com.clx.performance.model.loan.BorrowerConfig;
import com.clx.performance.param.pc.loan.carrier.PageBorrowerConfigParam;
import com.clx.performance.vo.pc.loan.carrier.BorrowerConfigVO;
import com.msl.common.base.Optional;
import com.msl.common.dao.BaseDao;
......
performance-web/src/main/java/com/clx/performance/dao/borrower/BorrowerDao.java → performance-web/src/main/java/com/clx/performance/dao/loan/BorrowerDao.java
浏览文件 @ 0fadcb00
package com.clx.performance.dao.borrower;
package com.clx.performance.dao.loan;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.mapper.borrower.BorrowerMapper;
import com.clx.performance.model.borrower.Borrower;
import com.clx.performance.param.pc.borrower.PageBorrowerParam;
import com.clx.performance.vo.pc.borrower.BorrowerVO;
import com.clx.performance.mapper.loan.BorrowerMapper;
import com.clx.performance.model.loan.Borrower;
import com.clx.performance.param.pc.loan.carrier.PageBorrowerParam;
import com.clx.performance.vo.pc.loan.carrier.BorrowerVO;
import com.msl.common.base.Optional;
import com.msl.common.dao.BaseDao;
......
performance-web/src/main/java/com/clx/performance/mapper/borrower/BorrowerConfigMapper.java → performance-web/src/main/java/com/clx/performance/mapper/loan/BorrowerConfigMapper.java
浏览文件 @ 0fadcb00
package com.clx.performance.mapper.borrower;
package com.clx.performance.mapper.loan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.model.borrower.BorrowerConfig;
import com.clx.performance.param.pc.borrower.PageBorrowerConfigParam;
import com.clx.performance.model.loan.BorrowerConfig;
import com.clx.performance.param.pc.loan.carrier.PageBorrowerConfigParam;
import com.clx.performance.sqlProvider.borrower.BorrowerConfigSqlProvider;
import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
import com.clx.performance.vo.pc.loan.carrier.BorrowerConfigVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.SelectProvider;
......
performance-web/src/main/java/com/clx/performance/mapper/borrower/BorrowerMapper.java → performance-web/src/main/java/com/clx/performance/mapper/loan/BorrowerMapper.java
浏览文件 @ 0fadcb00
package com.clx.performance.mapper.borrower;
package com.clx.performance.mapper.loan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.model.borrower.Borrower;
import com.clx.performance.param.pc.borrower.PageBorrowerParam;
import com.clx.performance.model.loan.Borrower;
import com.clx.performance.param.pc.loan.carrier.PageBorrowerParam;
import com.clx.performance.sqlProvider.borrower.BorrowerSqlProvider;
import com.clx.performance.vo.pc.borrower.BorrowerVO;
import com.clx.performance.vo.pc.loan.carrier.BorrowerVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.SelectProvider;
......
performance-web/src/main/java/com/clx/performance/model/borrower/Borrower.java → performance-web/src/main/java/com/clx/performance/model/loan/Borrower.java
浏览文件 @ 0fadcb00
package com.clx.performance.model.borrower;
package com.clx.performance.model.loan;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
......
performance-web/src/main/java/com/clx/performance/model/borrower/BorrowerConfig.java → performance-web/src/main/java/com/clx/performance/model/loan/BorrowerConfig.java
浏览文件 @ 0fadcb00
package com.clx.performance.model.borrower;
package com.clx.performance.model.loan;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
......
performance-web/src/main/java/com/clx/performance/model/nbbank/NbBankRecord.java
浏览文件 @ 0fadcb00
......@@ -28,7 +28,8 @@ public class NbBankRecord implements HasKey<Integer> {
private Integer id; //id
private Integer type; //类型：1转账直连下单 2银联订单支付收款模式 3交易结果查询 4异步通知交易结果
private String merId; //商户号
private String merSeqNo; //流水号
private String merSeqNo; //商户号流水号
private LocalDateTime merDtTm; //商户交易时间
private String transSeqNo; //第三方流水号
private Integer amount; //金额 （分）
private String param; //参数
......
performance-web/src/main/java/com/clx/performance/service/impl/borrower/BorrowerConfigServiceImpl.java → performance-web/src/main/java/com/clx/performance/service/impl/loan/BorrowerConfigServiceImpl.java
浏览文件 @ 0fadcb00
package com.clx.performance.service.impl.borrower;
package com.clx.performance.service.impl.loan;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.dao.borrower.BorrowerConfigDao;
import com.clx.performance.dao.borrower.BorrowerDao;
import com.clx.performance.dao.loan.BorrowerConfigDao;
import com.clx.performance.dao.loan.BorrowerDao;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.enums.borrower.BorrowerConfigEnum;
import com.clx.performance.model.borrower.Borrower;
import com.clx.performance.model.borrower.BorrowerConfig;
import com.clx.performance.param.pc.borrower.*;
import com.clx.performance.service.borrower.BorrowerConfigService;
import com.clx.performance.model.loan.Borrower;
import com.clx.performance.model.loan.BorrowerConfig;
import com.clx.performance.param.pc.loan.carrier.*;
import com.clx.performance.service.loan.BorrowerConfigService;
import com.clx.performance.struct.borrower.BorrowerConfigStruct;
import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
import com.clx.performance.vo.pc.loan.carrier.BorrowerConfigVO;
import com.msl.common.base.Optional;
import com.msl.common.exception.ServiceSystemException;
import com.msl.user.data.UserSessionData;
......
performance-web/src/main/java/com/clx/performance/service/impl/borrower/BorrowerServiceImpl.java → performance-web/src/main/java/com/clx/performance/service/impl/loan/BorrowerServiceImpl.java
浏览文件 @ 0fadcb00
package com.clx.performance.service.impl.borrower;
package com.clx.performance.service.impl.loan;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.dao.borrower.BorrowerDao;
import com.clx.performance.dao.loan.BorrowerDao;
import com.clx.performance.enums.PerformanceResultEnum;
import com.clx.performance.enums.borrower.BorrowerEnum;
import com.clx.performance.model.borrower.Borrower;
import com.clx.performance.param.pc.borrower.*;
import com.clx.performance.service.borrower.BorrowerService;
import com.clx.performance.model.loan.Borrower;
import com.clx.performance.param.pc.loan.carrier.*;
import com.clx.performance.service.loan.BorrowerService;
import com.clx.performance.struct.borrower.BorrowerStruct;
import com.clx.performance.vo.pc.borrower.BorrowerVO;
import com.clx.performance.vo.pc.loan.carrier.BorrowerVO;
import com.msl.common.base.Optional;
import com.msl.common.exception.ServiceSystemException;
import com.msl.user.data.UserSessionData;
......
performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankServiceImpl.java
浏览文件 @ 0fadcb00
......@@ -28,12 +28,12 @@ public class NbBankServiceImpl implements NbBankService {
/**
* 订单支付
* @return
* 第三方流水号
* @Param
* payType: 1转账直连下单 2银联订单支付收款模式
*/
@Override
public NbBankOrderPayResultVO orderPay(Integer payType) {
if (payType == 1){
if (payType == 1){ //转账直连下单
String merSeqNo = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
JSONObject data = bankThirdpartyService.directBankTransferOrder(merSeqNo, "EFT33021200556315", 1);
......@@ -48,7 +48,7 @@ public class NbBankServiceImpl implements NbBankService {
return result;
}
else if (payType == 2){
else if (payType == 2){ //银联订单支付收款模式
String merSeqNo = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"));
JSONObject data = bankThirdpartyService.unionPayDirectOrder(merSeqNo, "EFT33021200556315", 1,
"313332082914","86041110000076809", "黑玫瑰");
......@@ -71,7 +71,7 @@ public class NbBankServiceImpl implements NbBankService {
*/
@Override
public NbBankOrderPayStatusResultVO getOrderStatus(String merSeqNo) {
JSONObject data = bankThirdpartyService.queryOrder(merSeqNo);
JSONObject data = bankThirdpartyService.queryOrder(merSeqNo, "EFT33021200556315");
NbBankOrderPayStatusResultVO result = new NbBankOrderPayStatusResultVO();
......@@ -126,4 +126,30 @@ public class NbBankServiceImpl implements NbBankService {
}
@Override
public NbBankOrderPayStatusResultVO transferOrderStatus(String merSeqNo) {
JSONObject data = bankThirdpartyService.fundTransferOrder(merSeqNo, "EFT33021200556315", "",
1,
"1", "2");
NbBankOrderPayStatusResultVO result = new NbBankOrderPayStatusResultVO();
String transStatus = data.getString("transStatus");
if (StringUtils.equals(transStatus, "00")){result.setTransStatus(1);} //交易成功
else if (StringUtils.equals(transStatus, "01")){result.setTransStatus(2);} //交易失败
else if (StringUtils.equals(transStatus, "02")){result.setTransStatus(3);} //交易已受理
else if (StringUtils.equals(transStatus, "80")){result.setTransStatus(4);} //订单初始状态
else if (StringUtils.equals(transStatus, "90")){result.setTransStatus(5);} //交易不存在
else if (StringUtils.equals(transStatus, "99")){result.setTransStatus(6);} //交易超时,须发起交易结果查询
String transSeqNo = data.getString("transSeqNo");
result.setAmount(1);
result.setRealAmount(1);
result.setMerSeqNo(merSeqNo);
result.setTransSeqNo(transSeqNo);
return result;
}
}
performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankThirdpartyServiceImpl.java
浏览文件 @ 0fadcb00
......@@ -336,11 +336,11 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
* 99:交易超时,须发起交易结果查询
*/
@Override
public JSONObject queryOrder(String merSeqNo) {
public JSONObject queryOrder(String merSeqNo, String merId) {
try {
JSONObject jsonObject = new JSONObject();
jsonObject.put("transId", "IP01"); //交易识别码 必填
jsonObject.put("merId", "EFT33021200556315"); //商户号 必填
jsonObject.put("merId", merId); //商户号 必填
jsonObject.put("merSeqNo", merSeqNo); //商户流水 必填
......@@ -382,6 +382,66 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_API_ERROR);
}
/**
* 调账
* 5.10云账簿资金划转
* @param merSeqNo
* @return
*/
@Override
public JSONObject fundTransferOrder(String merSeqNo, String merId, String merDtTm,
Integer trxAmt,
String customerId, String payCustomerId) {
try {
JSONObject jsonObject = new JSONObject();
jsonObject.put("transId", "IP01"); //交易识别码 必填
jsonObject.put("merId", merId); //商户号 必填
jsonObject.put("merSeqNo", merSeqNo); //商户流水 必填
jsonObject.put("merDtTm", merDtTm); //商户交易时间 必填
jsonObject.put("trxAmt", new BigDecimal(trxAmt).movePointLeft(2)); //交易金额
jsonObject.put("customerId", customerId); //云账簿标识_收款方
jsonObject.put("payCustomerId", payCustomerId); //云账簿标识_付款方
// jsonObject.put("notifyAction", 0); //是否通知
HashMap<String,String> httpHeader = new HashMap<>();
RequestApiData requestApiData = new RequestApiData();
requestApiData.setAppkey(nbBankConfig.getAppKey());
requestApiData.setData(jsonObject);
requestApiData.setProductId("YFT");
requestApiData.setServiceId("fundTransferOrder");
requestApiData.setHttpHeader(httpHeader);
RequestHead requestHead = new RequestHead();
requestHead.setRqsJrnlNo(NBOpenSDK.getRandom());
SDKRequest request = new SDKRequest();
request.setData(requestApiData);
request.setHead(requestHead);
log.info("宁波银行, 调账接口(fundTransferOrder), 参数: {}", JSON.toJSONString(request));
SDKResponse response = NBOpenSDK.send(request);
log.info("宁波银行, 调账接口(fundTransferOrder), 结果: {}", JSON.toJSONString(response));
recordSave(NbBankRecordEnum.Type.FUND_TRANSFER_ORDER.getCode(), request, response);
JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
JSONObject data = responseJson.getJSONObject("data");
if (!StringUtils.equals(data.getString("errorCode"), "000000")){
log.info("宁波银行, 调账接口(fundTransferOrder), code:{}, msg:{}", data.getString("errorCode"), data.getString("errorMsg"));
throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_API_ERROR);
}
return data;
} catch (Exception e) {
e.printStackTrace();
}
throw new ServiceSystemException(PerformanceResultEnum.NB_BANK_API_ERROR);
}
@Override
public void recordSave(Integer type, SDKRequest request, SDKResponse response) {
......@@ -395,6 +455,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
recordSave(type
, requestDataJson.getString("merId")
, requestDataJson.getString("merSeqNo")
, requestDataJson.getString("merDtTm")
, responseDataJson.getString("transSeqNo")
, requestDataJson.getBigDecimal("trxAmt").movePointRight(2).intValue()
, JSON.toJSONString(request)
......@@ -414,6 +475,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
recordSave(type
, requestDataJson.getString("merId")
, requestDataJson.getString("merSeqNo")
, requestDataJson.getString("merDtTm")
, responseDataJson.getString("transSeqNo")
, requestDataJson.getBigDecimal("trxAmt").movePointRight(2).intValue()
, JSON.toJSONString(request)
......@@ -424,18 +486,22 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
);
}
else if (Objects.equals(type, NbBankRecordEnum.Type.QUERY_ORDER.getCode())) {
RequestApiData requestData = (RequestApiData) (request.getData());
JSONObject requestDataJson = (JSONObject) (requestData.getData());
JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
JSONObject responseDataJson = responseJson.getJSONObject("data");
recordSave(type
, responseDataJson.getString("merId")
, responseDataJson.getString("merSeqNo")
, requestDataJson.getString("merId")
, requestDataJson.getString("merSeqNo")
, requestDataJson.getString("merDtTm")
, responseDataJson.getString("transSeqNo")
, responseDataJson.getBigDecimal("trxAmt").movePointRight(2).intValue()
, JSON.toJSONString(request)
, JSON.toJSONString(response)
, null
, null
, responseDataJson.getString("errorCode")
, responseDataJson.getString("errorMsg")
, responseDataJson.getString("transStatus")
);
}
......@@ -446,6 +512,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
recordSave(type
, responseDataJson.getString("merId")
, responseDataJson.getString("merSeqNo")
, null
, responseDataJson.getString("transSeqNo")
, responseDataJson.getBigDecimal("trxAmt").movePointRight(2).intValue()
, JSON.toJSONString(request)
......@@ -455,10 +522,31 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
, responseDataJson.getString("transStatus")
);
}
else if (Objects.equals(type, NbBankRecordEnum.Type.FUND_TRANSFER_ORDER.getCode())) {
RequestApiData requestData = (RequestApiData) (request.getData());
JSONObject requestDataJson = (JSONObject) (requestData.getData());
JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
JSONObject responseDataJson = responseJson.getJSONObject("data");
recordSave(type
, requestDataJson.getString("merId")
, requestDataJson.getString("merSeqNo")
, requestDataJson.getString("merDtTm")
, responseDataJson.getString("transSeqNo")
, requestDataJson.getBigDecimal("trxAmt").movePointRight(2).intValue()
, JSON.toJSONString(request)
, JSON.toJSONString(response)
, responseDataJson.getString("errorCode")
, responseDataJson.getString("errorMsg")
, responseDataJson.getString("transStatus")
);
}
}
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void recordSave(Integer type,
String merId, String merSeqNo, String transSeqNo,
String merId, String merSeqNo, String merDtTm, String transSeqNo,
Integer amount,
String param, String result,
String errorCode, String errorMsg,
......@@ -468,6 +556,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
record.setType(type);
record.setMerId(merId);
record.setMerSeqNo(merSeqNo);
record.setMerDtTm(LocalDateTimeUtils.parseTime(merDtTm));
record.setTransSeqNo(transSeqNo);
record.setAmount(amount);
record.setParam(param);
......
performance-web/src/main/java/com/clx/performance/service/borrower/BorrowerConfigService.java → performance-web/src/main/java/com/clx/performance/service/loan/BorrowerConfigService.java
浏览文件 @ 0fadcb00
package com.clx.performance.service.borrower;
package com.clx.performance.service.loan;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.pc.borrower.*;
import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
import com.clx.performance.vo.pc.borrower.BorrowerVO;
import com.clx.performance.param.pc.loan.carrier.*;
import com.clx.performance.vo.pc.loan.carrier.BorrowerConfigVO;
import java.util.List;
......
performance-web/src/main/java/com/clx/performance/service/borrower/BorrowerService.java → performance-web/src/main/java/com/clx/performance/service/loan/BorrowerService.java
浏览文件 @ 0fadcb00
package com.clx.performance.service.borrower;
package com.clx.performance.service.loan;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.clx.performance.param.pc.borrower.*;
import com.clx.performance.vo.pc.borrower.BorrowerVO;
import com.clx.performance.param.pc.loan.carrier.*;
import com.clx.performance.vo.pc.loan.carrier.BorrowerVO;
import java.util.List;
......
performance-web/src/main/java/com/clx/performance/service/thirdparty/nbbank/NbBankService.java
浏览文件 @ 0fadcb00
......@@ -17,4 +17,6 @@ public interface NbBankService {
String signNo
);
NbBankOrderPayStatusResultVO transferOrderStatus(String merSeqNo);
}
performance-web/src/main/java/com/clx/performance/service/thirdparty/nbbank/NbBankThirdpartyService.java
浏览文件 @ 0fadcb00
......@@ -11,7 +11,11 @@ public interface NbBankThirdpartyService {
JSONObject unionPayDirectOrder(String merSeqNo, String merId, Integer amount,
String payAcctOpenBankId, String payAcctNo, String payAcctNm);
JSONObject queryOrder(String merSeqNo);
JSONObject queryOrder(String merSeqNo, String merId);
JSONObject fundTransferOrder(String merSeqNo, String merId, String merDtTm,
Integer trxAmt,
String customerId, String payCustomerId);
void recordSave(Integer type, SDKRequest request, SDKResponse response);
......
performance-web/src/main/java/com/clx/performance/sqlProvider/borrower/BorrowerConfigSqlProvider.java
浏览文件 @ 0fadcb00
package com.clx.performance.sqlProvider.borrower;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.param.pc.borrower.PageBorrowerConfigParam;
import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
import com.clx.performance.param.pc.loan.carrier.PageBorrowerConfigParam;
import com.clx.performance.vo.pc.loan.carrier.BorrowerConfigVO;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.jdbc.SQL;
......
performance-web/src/main/java/com/clx/performance/sqlProvider/borrower/BorrowerSqlProvider.java
浏览文件 @ 0fadcb00
package com.clx.performance.sqlProvider.borrower;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.clx.performance.param.pc.borrower.PageBorrowerParam;
import com.clx.performance.vo.pc.borrower.BorrowerVO;
import com.clx.performance.param.pc.loan.carrier.PageBorrowerParam;
import com.clx.performance.vo.pc.loan.carrier.BorrowerVO;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.jdbc.SQL;
......
performance-web/src/main/java/com/clx/performance/struct/borrower/BorrowerConfigStruct.java
浏览文件 @ 0fadcb00
package com.clx.performance.struct.borrower;
import com.clx.performance.model.borrower.BorrowerConfig;
import com.clx.performance.vo.pc.borrower.BorrowerConfigVO;
import com.clx.performance.model.loan.BorrowerConfig;
import com.clx.performance.vo.pc.loan.carrier.BorrowerConfigVO;
import com.msl.common.utils.DateStructUtil;
import com.msl.common.utils.DateUtils;
import org.mapstruct.Mapper;
......
performance-web/src/main/java/com/clx/performance/struct/borrower/BorrowerStruct.java
浏览文件 @ 0fadcb00
package com.clx.performance.struct.borrower;
import com.clx.performance.model.borrower.Borrower;
import com.clx.performance.vo.pc.borrower.BorrowerVO;
import com.clx.performance.model.loan.Borrower;
import com.clx.performance.vo.pc.loan.carrier.BorrowerVO;
import com.msl.common.utils.DateStructUtil;
import com.msl.common.utils.DateUtils;
import org.mapstruct.Mapper;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论