Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'…

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/OwnerLoanAccountRunningWaterRecordVO.java

 package com.clx.performance.vo.pc.loan.carrier;
 
+import com.clx.performance.enums.loan.OwnerLoanAccountRunningWaterRecordEnum;
+import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -8,7 +10,6 @@ import lombok.Setter;
 import lombok.ToString;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
 * @Author: aiqinguo
@@ -40,8 +41,22 @@ public class OwnerLoanAccountRunningWaterRecordVO {
     private String childNo;
     @ApiModelProperty(value = "流水类型 70：运单核销 80：借款", example = "10")
     private Integer runningWaterType;
+    @ApiModelProperty(value = "流水类型 70：运单核销 80：借款", example = "10")
+    private String runningWaterTypeMsg;
+    public String getRunningWaterTypeMsg() {
+        return OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.getMsgByCode(runningWaterType);
+    }
+
+    @MoneyOutConvert
     @ApiModelProperty(value = "金额", example = "1.23")
     private BigDecimal alterationBalance;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "可用余额", example = "1.23")
+    private BigDecimal useableBalance;
+    @MoneyOutConvert
+    @ApiModelProperty(value = "冻结余额", example = "1.23")
+    private BigDecimal frozenBalance;
+    @MoneyOutConvert
     @ApiModelProperty(value = "账户余额", example = "1.23")
     private BigDecimal accountBalance;
     @ApiModelProperty(value = "创建人", example = "张三")

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/config/nbbank/NbBankConfig.java

@@ -11,8 +11,8 @@ import org.springframework.context.annotation.Configuration;
 @ConfigurationProperties(prefix = "nbbank")
 public class NbBankConfig {
 
-    private String appKey = "77667c76_3503_4c04_95f7_fc10938c7942";
-    private String merId = "EFT33021200556315";
+    private String appKey;
+    private String merId;
     private String configFilePath;
     private String publicKeyPath;
     private String privateKeyPath;

performance-web/src/main/java/com/clx/performance/controller/thirdparty/NbBankController.java

 package com.clx.performance.controller.thirdparty;
 
 import com.alibaba.fastjson.JSON;
+import com.clx.performance.config.nbbank.NbBankConfig;
 import com.clx.performance.service.thirdparty.nbbank.NbBankNotifyService;
 import com.nbopen.api.*;
 import io.swagger.annotations.Api;
@@ -21,6 +22,9 @@ import java.util.Map;
 @Api(tags = "宁波银行回调 (易付通)")
 public class NbBankController {
 
+    @Autowired
+    private NbBankConfig nbBankConfig;
+
     @Autowired
     private NbBankNotifyService nbBankNotifyService;
 
@@ -45,7 +49,7 @@ public class NbBankController {
         data.put("errorMsg", "成功");
 
         RequestApiData requestApiData = new RequestApiData();
-        requestApiData.setAppkey("77667c76_3503_4c04_95f7_fc10938c7942");
+        requestApiData.setAppkey(nbBankConfig.getAppKey());
         requestApiData.setData(data);
         requestApiData.setServiceId("notifyMerchant");
 
@@ -70,7 +74,7 @@ public class NbBankController {
         data.put("errorMsg", "失败");
 
         RequestApiData requestApiData = new RequestApiData();
-        requestApiData.setAppkey("77667c76_3503_4c04_95f7_fc10938c7942");
+        requestApiData.setAppkey(nbBankConfig.getAppKey());
         requestApiData.setData(data);
         requestApiData.setServiceId("notifyMerchant");
 

performance-web/src/main/java/com/clx/performance/model/loan/OwnerLoanAccountRunningWaterRecord.java

@@ -68,7 +68,14 @@ public class OwnerLoanAccountRunningWaterRecord implements HasKey<Integer> {
     @ApiModelProperty("金额")
     private BigDecimal alterationBalance;
 
-    
+    @TableField("useable_balance")
+    @ApiModelProperty("可用余额")
+    private BigDecimal useableBalance;
+
+    @TableField("frozen_balance")
+    @ApiModelProperty("冻结余额")
+    private BigDecimal frozenBalance;
+
     @TableField("account_balance")
     @ApiModelProperty("账户余额")
     private BigDecimal accountBalance;

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;
     }
@@ -155,7 +157,7 @@ public class NbBankServiceImpl implements NbBankService {
 
     /**
      * 退款
-     * @Param type: 1普通退款 2银行转账退款
+     * @Param type: 1普通退款 2银行转账退款 3银联订单支付撤单
      * @param orgMerSeqNo 商户流水号（原）
      * @param amount 金额分
      * @param orgTransSeqNo 第三方流水号 (原)

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

@@ -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<>();
@@ -492,7 +492,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
      *         "rspTime": "10:18:35:131"
      *     }
      * }
-     * @Param type: 1普通退款 2银行转账退款
+     * @Param type: 1普通退款 2银行转账退款 3银联订单支付撤单
      * @return
      */
     @Override
@@ -501,7 +501,7 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
                              String orgMerSeqNo, String coreSeqNo) {
         try {
             JSONObject jsonObject = new JSONObject();
-            jsonObject.put("transId", type==1? "TK01" : "TK02");                   //交易识别码 必填
+            jsonObject.put("transId", getRefundTransId(type));                     //交易识别码 必填
             jsonObject.put("merId", nbBankConfig.getMerId());                      //商户号 必填
 
             jsonObject.put("merSeqNo", merSeqNo);           //商户流水 必填
@@ -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")
@@ -699,4 +705,13 @@ public class NbBankThirdpartyServiceImpl implements NbBankThirdpartyService {
         nbBankRecordDao.saveEntity(record);
     }
 
+    /**
+     * 获取退款交易识别码
+     */
+    private String getRefundTransId(Integer type){
+        if (type == 1) {return "TK01";}
+        if (type == 2) {return "TK02";}
+        return "CD01";
+
+    }
 }

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);