承运借款流程-宁波银行

performance-api/src/main/java/com/clx/performance/vo/pc/nbbank/NbBankOrderPayResultVO.java

@@ -22,13 +22,16 @@ public class NbBankOrderPayResultVO {
     @ApiModelProperty(value = "金额（分）", example = "1")
     private Integer amount;
 
-    @ApiModelProperty(value = "商户时间", example = "")
+    @ApiModelProperty(value = "商户时间 (下单时间)", example = "")
     private String merDtTm;
+
     @ApiModelProperty(value = "商户流水号", example = "20231129145541")
     private String merSeqNo;
     @ApiModelProperty(value = "第三方流水号", example = "20231129145541065503563czKTBzy")
     private String transSeqNo;
     @ApiModelProperty(value = "转账编号 (转账专用)", example = "123456")
     private String signNo;
+    @ApiModelProperty(value = "关单时间 (转账专用)", example = "")
+    private String closeDtTm;
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankServiceImpl.java

@@ -41,7 +41,8 @@ public class NbBankServiceImpl implements NbBankService {
         String merSeqNo = idGenerateSnowFlake.nextIdToString(3L);
 
         String merDtTm = LocalDateTimeUtils.formatTime();
-        JSONObject data = bankThirdpartyService.directBankTransferOrder(merSeqNo, merDtTm, amount);
+        String closeDtTm = LocalDateTimeUtils.formatTime(LocalDateTimeUtils.parseTime(merDtTm).plusDays(30));
+        JSONObject data = bankThirdpartyService.directBankTransferOrder(merSeqNo, merDtTm, closeDtTm, amount);
 
         String transSeqNo = data.getString("transSeqNo");
         String cardNo = data.getString("cardNo");
@@ -53,6 +54,7 @@ public class NbBankServiceImpl implements NbBankService {
         result.setMerSeqNo(merSeqNo);
         result.setTransSeqNo(transSeqNo);
         result.setSignNo(signNo);
+        result.setCloseDtTm(closeDtTm);
 
         return result;
     }

performance-web/src/main/java/com/clx/performance/service/impl/thirdparty/nbbank/NbBankThirdpartyServiceImpl.java

@@ -39,7 +39,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
     @Autowired
     private NbBankRecordDao nbBankRecordDao;
 
-    @PostConstruct
+//    @PostConstruct
     public void bankInit() throws IOException {
         File file = new File("/app/nbbank");
         file.mkdir();
@@ -114,7 +114,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
      * amount: 订单金额(分)
      */
     @Override
-    public JSONObject directBankTransferOrder(String merSeqNo, String merDtTm, Integer amount) {
+    public JSONObject directBankTransferOrder(String merSeqNo, String merDtTm, String closeDtTm, Integer amount) {
         try {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("transId", "IP01");           //交易识别码 必填
@@ -130,7 +130,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
             jsonObject.put("productNum", "1");           //商品数量 必填
 
 
-//            jsonObject.put("closeDtTm", "2023-11-29 13:39:16");     //关单时间
+            jsonObject.put("closeDtTm", closeDtTm);     //关单时间
 //            jsonObject.put("mobilePhone", "13000000000");     //手机号
 
             HashMap<String,String> httpHeader = new HashMap<>();
@@ -561,6 +561,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
 
             JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
             JSONObject responseDataJson = responseJson.getJSONObject("data");
+            if (responseDataJson == null) {responseDataJson = new JSONObject();}
 
             recordSave(type
                     , requestDataJson.getString("merId")
@@ -581,6 +582,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
 
             JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
             JSONObject responseDataJson = responseJson.getJSONObject("data");
+            if (responseDataJson == null) {responseDataJson = new JSONObject();}
 
             recordSave(type
                     , requestDataJson.getString("merId")
@@ -601,6 +603,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
 
             JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
             JSONObject responseDataJson = responseJson.getJSONObject("data");
+            if (responseDataJson == null) {responseDataJson = new JSONObject();}
 
             recordSave(type
                     , requestDataJson.getString("merId")
@@ -618,6 +621,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
         else if (Objects.equals(type, NbBankRecordEnum.Type.NOTIFY_MERCHANT.getCode())) {
             JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
             JSONObject responseDataJson = responseJson.getJSONObject("data");
+            if (responseDataJson == null) {responseDataJson = new JSONObject();}
 
             recordSave(type
                     , responseDataJson.getString("merId")
@@ -638,6 +642,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
 
             JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
             JSONObject responseDataJson = responseJson.getJSONObject("data");
+            if (responseDataJson == null) {responseDataJson = new JSONObject();}
 
             recordSave(type
                     , requestDataJson.getString("merId")
@@ -658,6 +663,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
 
             JSONObject responseJson = JSON.parseObject(JSON.toJSONString(response));
             JSONObject responseDataJson = responseJson.getJSONObject("data");
+            if (responseDataJson == null) {responseDataJson = new JSONObject();}
 
             recordSave(type
                     , requestDataJson.getString("merId")

performance-web/src/main/java/com/clx/performance/service/thirdparty/nbbank/NbBankThirdpartyService.java

@@ -6,7 +6,7 @@ import com.nbopen.api.SDKResponse;
 
 public interface NbBankThirdpartyService {
 
-    JSONObject directBankTransferOrder(String merSeqNo, String merDtTm, Integer amount);
+    JSONObject directBankTransferOrder(String merSeqNo, String merDtTm, String closeDtTm, Integer amount);
 
     JSONObject unionPayDirectOrder(String merSeqNo, String merDtTm, Integer amount,
                                    String payAcctOpenBankId, String payAcctNo, String payAcctNm);