承运借款流程-宁波银行

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

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

performance-api/src/main/java/com/clx/performance/vo/pc/nbbank/NbBankOrderPayStatusResultVO.java → performance-api/src/main/java/com/clx/performance/vo/pc/nbbank/NbBankOrderResultVO.java

@@ -17,18 +17,20 @@ import lombok.ToString;
 @Setter
 @ToString
 @NoArgsConstructor
-public class NbBankOrderPayStatusResultVO {
+public class NbBankOrderResultVO {
 
     @ApiModelProperty(value = "金额（分）", example = "")
     private Integer amount;
     @ApiModelProperty(value = "实收金额（分）", example = "")
     private Integer realAmount;
 
-    @ApiModelProperty(value = "流水号", example = "20231129145541")
+    @ApiModelProperty(value = "商户时间")
+    private String merDtTm;
+    @ApiModelProperty(value = "商户流水号", example = "20231129145541")
     private String merSeqNo;
     @ApiModelProperty(value = "第三方流水号", example = "20231129145541065503563czKTBzy")
     private String transSeqNo;
-    @ApiModelProperty(value = "转账编号", example = "")
+    @ApiModelProperty(value = "转账编号（转账专用）", example = "1234567")
     private String signNo;
 
     @ApiModelProperty(value = "交易状态", example = "")

performance-web/src/main/java/com/clx/performance/config/nbbank/NbBankConfig.java

@@ -12,5 +12,6 @@ import org.springframework.context.annotation.Configuration;
 public class NbBankConfig {
 
     private String appKey = "77667c76_3503_4c04_95f7_fc10938c7942";
+    private String merId = "EFT33021200556315";
 
 }

performance-web/src/main/java/com/clx/performance/controller/temp/TempBankController.java

@@ -2,7 +2,7 @@ package com.clx.performance.controller.temp;
 
 import com.clx.performance.service.thirdparty.nbbank.NbBankService;
 import com.clx.performance.vo.pc.nbbank.NbBankOrderPayResultVO;
-import com.clx.performance.vo.pc.nbbank.NbBankOrderPayStatusResultVO;
+import com.clx.performance.vo.pc.nbbank.NbBankOrderResultVO;
 import com.msl.common.result.Result;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -26,39 +26,39 @@ public class TempBankController {
     @Autowired
     private NbBankService bankService;
 
-    @ApiOperation(value = "转账", notes = "<br>By:艾庆国")
-    @RequestMapping(value = "/directBankTransferOrder", method = RequestMethod.POST)
-    public Result<NbBankOrderPayResultVO> directBankTransferOrder() throws Exception {
+    @ApiOperation(value = "转账支付", notes = "<br>By:艾庆国")
+    @RequestMapping(value = "/orderTransferPay", method = RequestMethod.POST)
+    public Result<NbBankOrderPayResultVO> directBankTransferOrder() {
 
-        return Result.ok(bankService.orderPay(1));
+        return Result.ok(bankService.orderTransferPay(1));
     }
 
     @ApiOperation(value = "订单支付", notes = "<br>By:艾庆国")
-    @RequestMapping(value = "/unionPayDirectOrder", method = RequestMethod.POST)
-    public Result<NbBankOrderPayResultVO> unionPayDirectOrder() throws Exception {
+    @RequestMapping(value = "/orderDirectPay", method = RequestMethod.POST)
+    public Result<NbBankOrderPayResultVO> orderDirectPay() {
 
-        return Result.ok(bankService.orderPay(2));
+        return Result.ok(bankService.orderDirectPay(2,"313332082914","86041110000076809", "黑玫瑰"));
     }
 
     @ApiOperation(value = "查询", notes = "<br>By:艾庆国")
-    @RequestMapping(value = "/queryOrder", method = RequestMethod.POST)
-    public Result<NbBankOrderPayStatusResultVO> queryOrder(String merSeqNo) throws Exception {
+    @RequestMapping(value = "/getResult", method = RequestMethod.POST)
+    public Result<NbBankOrderResultVO> getResult(String merSeqNo) {
 
-        return Result.ok(bankService.getOrderStatus(merSeqNo));
+        return Result.ok(bankService.getResult(merSeqNo));
     }
 
     @ApiOperation(value = "调账", notes = "<br>By:艾庆国")
-    @RequestMapping(value = "/transferOrder", method = RequestMethod.POST)
-    public Result<NbBankOrderPayStatusResultVO> transferOrder(String merSeqNo) throws Exception {
+    @RequestMapping(value = "/adjust", method = RequestMethod.POST)
+    public Result<NbBankOrderResultVO> adjust(String merSeqNo, Integer amount) {
 
-        return Result.ok(bankService.transferOrder(merSeqNo));
+        return Result.ok(bankService.adjust(merSeqNo, amount));
     }
 
     @ApiOperation(value = "退款", notes = "<br>By:艾庆国")
     @RequestMapping(value = "/refund", method = RequestMethod.POST)
-    public Result<NbBankOrderPayStatusResultVO> refund(String merSeqNo) throws Exception {
+    public Result<NbBankOrderResultVO> refund(String orgMerSeqNo, Integer amount, String orgTransSeqNo) {
 
-        return Result.ok(bankService.refund(merSeqNo));
+        return Result.ok(bankService.refund(orgMerSeqNo,amount,orgTransSeqNo));
     }
 
 }

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

@@ -96,8 +96,8 @@ public class NbBankNotifyServiceImpl implements NbBankNotifyService {
 
             String merSeqNo = data.getString("merSeqNo");
             String transSeqNo = data.getString("transSeqNo");
-            BigDecimal trxAmt = data.getBigDecimal("trxAmt");
-            BigDecimal realTrxAmt = data.getBigDecimal("realTrxAmt");
+            Integer trxAmt = data.getBigDecimal("trxAmt").movePointRight(2).intValue();
+            Integer realTrxAmt = data.getBigDecimal("realTrxAmt").movePointRight(2).intValue();
             String transStatus = data.getString("transStatus");
             String signNo = data.getString("signNo");
 

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

@@ -88,17 +88,17 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
      * amount: 订单金额(分)
      */
     @Override
-    public JSONObject directBankTransferOrder(String merSeqNo, String merId, Integer amount) {
+    public JSONObject directBankTransferOrder(String merSeqNo, String merDtTm, Integer amount) {
         try {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("transId", "IP01");           //交易识别码 必填
-            jsonObject.put("merId", merId);              //商户号 必填
+            jsonObject.put("merId", nbBankConfig.getMerId());              //商户号 必填
 
             jsonObject.put("merSeqNo", merSeqNo);        //商户流水 必填
-            jsonObject.put("merDtTm", LocalDateTimeUtils.formatTime());             //商户时间 必填
+            jsonObject.put("merDtTm", merDtTm);          //商户时间 必填
 
             jsonObject.put("trxAmt", new BigDecimal(amount).movePointLeft(2));      //订单金额 必填
-            jsonObject.put("orderDesc", "散煤运输");          //订单详情 必填
+            jsonObject.put("orderDesc", "散煤运输");      //订单详情 必填
             jsonObject.put("productName", "运费");        //商品名称 必填
             jsonObject.put("productId", "001");          //商品编号 必填
             jsonObject.put("productNum", "1");           //商品数量 必填
@@ -183,18 +183,18 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
      * payAcctNm: 付款户名
      */
     @Override
-    public JSONObject unionPayDirectOrder(String merSeqNo, String merId, Integer amount,
+    public JSONObject unionPayDirectOrder(String merSeqNo, String merDtTm, Integer amount,
                                           String payAcctOpenBankId, String payAcctNo, String payAcctNm) {
         try {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("transId", "IP01");           //交易识别码 必填
-            jsonObject.put("merId", merId);              //商户号 必填
+            jsonObject.put("merId", nbBankConfig.getMerId());              //商户号 必填
 
             jsonObject.put("merSeqNo", merSeqNo);        //商户流水 必填
-            jsonObject.put("merDtTm", LocalDateTimeUtils.formatTime());            //商户时间 必填
+            jsonObject.put("merDtTm", merDtTm);          //商户时间 必填
 
             jsonObject.put("trxAmt", new BigDecimal(amount).movePointLeft(2));     //订单金额 必填
-            jsonObject.put("orderDesc", "散煤运输");          //订单详情 必填
+            jsonObject.put("orderDesc", "散煤运输");       //订单详情 必填
             jsonObject.put("productName", "运费");        //商品名称 必填
             jsonObject.put("productId", "001");           //商品编号 必填
             jsonObject.put("productNum", "1");            //商品数量 必填
@@ -337,13 +337,13 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
      * 99:交易超时,须发起交易结果查询
      */
     @Override
-    public JSONObject queryOrder(String merSeqNo, String merId) {
+    public JSONObject queryOrder(String orgMerSeqNo) {
         try {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("transId", "IP01");          //交易识别码 必填
-            jsonObject.put("merId", merId);             //商户号 必填
+            jsonObject.put("merId", nbBankConfig.getMerId());             //商户号 必填
 
-            jsonObject.put("merSeqNo", merSeqNo);       //商户流水 必填
+            jsonObject.put("merSeqNo", orgMerSeqNo);       //商户流水 必填
 
             HashMap<String,String> httpHeader = new HashMap<>();
 
@@ -386,23 +386,24 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
     /**
      * 调账
      * 5.10云账簿资金划转
-     * @param merSeqNo
-     * @return
      */
     @Override
-    public JSONObject fundTransferOrder(String merSeqNo, String merId, String merDtTm,
-                                        Integer trxAmt,
+    public JSONObject fundTransferOrder(String orgMerSeqNo, 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("merId", nbBankConfig.getMerId());       //商户号 必填
+            jsonObject.put("merSeqNo", orgMerSeqNo);                //商户流水 必填
 
             jsonObject.put("merDtTm", merDtTm);                     //商户交易时间 必填
             jsonObject.put("trxAmt", new BigDecimal(trxAmt).movePointLeft(2));                 //交易金额
-            jsonObject.put("customerId", customerId);               //云账簿标识_收款方
-            jsonObject.put("payCustomerId", payCustomerId);         //云账簿标识_付款方
+            if (StringUtils.isNotBlank(customerId)) {
+                jsonObject.put("customerId", customerId);           //云账簿标识_收款方
+            }
+            if (StringUtils.isNotBlank(payCustomerId)) {
+                jsonObject.put("payCustomerId", payCustomerId);     //云账簿标识_付款方
+            }
 //            jsonObject.put("notifyAction", 0);                  //是否通知
 
             HashMap<String,String> httpHeader = new HashMap<>();
@@ -449,20 +450,22 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
      * @return
      */
     @Override
-    public JSONObject refund(String merSeqNo, String merId, String merDtTm,
+    public JSONObject refund(String merSeqNo, String merDtTm,
                              Integer amount,
                              String orgMerSeqNo, String coreSeqNo) {
         try {
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("transId", "IP01");              //交易识别码 必填
-            jsonObject.put("merId", merId);                 //商户号 必填
+            jsonObject.put("merId", nbBankConfig.getMerId());                      //商户号 必填
 
             jsonObject.put("merSeqNo", merSeqNo);           //商户流水 必填
             jsonObject.put("merDtTm", LocalDateTimeUtils.formatTime());            //商户时间 必填
 
             jsonObject.put("trxAmt", new BigDecimal(amount).movePointLeft(2));     //订单金额 必填
             jsonObject.put("orgMerSeqNo", orgMerSeqNo);     //原订单流水号 必填
-            jsonObject.put("coreSeqNo", coreSeqNo);         //核心流水号 必填
+            if (StringUtils.isNotBlank(coreSeqNo)) {
+                jsonObject.put("coreSeqNo", coreSeqNo);     //核心流水号 必填
+            }
 
             HashMap<String,String> httpHeader = new HashMap<>();
 

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

 package com.clx.performance.service.thirdparty.nbbank;
 
 import com.clx.performance.vo.pc.nbbank.NbBankOrderPayResultVO;
-import com.clx.performance.vo.pc.nbbank.NbBankOrderPayStatusResultVO;
-
-import java.math.BigDecimal;
+import com.clx.performance.vo.pc.nbbank.NbBankOrderResultVO;
 
 public interface NbBankService {
 
-    NbBankOrderPayResultVO orderPay(Integer payType);
+    NbBankOrderPayResultVO orderTransferPay(Integer amount);
+
+    NbBankOrderPayResultVO orderDirectPay(Integer amount,
+                                          String payAcctOpenBankId, String payAcctNo, String payAcctNm);
+
+    NbBankOrderResultVO getResult(String merSeqNo);
 
-    NbBankOrderPayStatusResultVO getOrderStatus(String merSeqNo);
+    NbBankOrderResultVO adjust(String orgMerSeqNo, Integer amount);
+
+    NbBankOrderResultVO refund(String orgMerSeqNo, Integer amount, String orgTransSeqNo);
 
     void orderPayCallback(String merSeqNo, String transSeqNo,
-                          BigDecimal trxAmt, BigDecimal realTrxAmt,
+                          Integer trxAmt, Integer realTrxAmt,
                           String transStatus,
                           String signNo
     );
 
-    NbBankOrderPayStatusResultVO transferOrder(String merSeqNo);
-
-    NbBankOrderPayStatusResultVO refund(String merSeqNo);
-
 }

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

@@ -6,19 +6,18 @@ import com.nbopen.api.SDKResponse;
 
 public interface NbBankThirdpartyService {
 
-    JSONObject directBankTransferOrder(String merSeqNo, String merId, Integer amount);
+    JSONObject directBankTransferOrder(String merSeqNo, String merDtTm, Integer amount);
 
-    JSONObject unionPayDirectOrder(String merSeqNo, String merId, Integer amount,
+    JSONObject unionPayDirectOrder(String merSeqNo, String merDtTm, Integer amount,
                                    String payAcctOpenBankId, String payAcctNo, String payAcctNm);
 
-    JSONObject queryOrder(String merSeqNo, String merId);
+    JSONObject queryOrder(String orgMerSeqNo);
 
-    JSONObject fundTransferOrder(String merSeqNo, String merId, String merDtTm,
+    JSONObject fundTransferOrder(String orgMerSeqNo, String merDtTm,
                                  Integer trxAmt,
                                  String customerId, String payCustomerId);
 
-    JSONObject refund(String merSeqNo, String merId, String merDtTm,
-                      Integer amount,
+    JSONObject refund(String merSeqNo, String merDtTm, Integer amount,
                       String orgMerSeqNo, String coreSeqNo);
 
     void recordSave(Integer type, SDKRequest request, SDKResponse response);