Procházet zdrojové kódy

fix:"优化汇付取现接口"

soobin před 4 měsíci
rodič
revize
eace2fc66f

+ 12 - 0
src/main/java/com/szwl/controller/PurseController.java

@@ -2,6 +2,7 @@ package com.szwl.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huifu.bspay.sdk.opps.core.exception.BasePayException;
 import com.szwl.constant.JoinpayConstant;
 import com.szwl.model.bo.BalanceBo;
 import com.szwl.model.bo.R;
@@ -119,6 +120,17 @@ public class PurseController {
             }
         } else if (payPlatform.equals("1")) {
             // 汇付
+            LambdaQueryWrapper<THuifuMch> query = Wrappers.lambdaQuery();
+            query.eq(THuifuMch::getAdminId, withdrawalRecord.getAdminId());
+            THuifuMch huifuMch = tHuifuMchService.getOne(query);
+            try {
+                result = tHuifuMchService.withdraw(String.valueOf(withdrawalRecord.getAmount()), huifuMch.getHuifuId(), "T1", huifuMch.getTokenNo());
+            } catch (BasePayException e) {
+                throw new RuntimeException(e);
+            }
+            if (result.equals("00000000")) {
+                return R.ok();
+            }
         }
         return R.fail(result);
     }

+ 1 - 1
src/main/java/com/szwl/mapper/THuifuMchMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author wuhs
- * @since 2023-07-12
+ * @since 2025-04-17
  */
 public interface THuifuMchMapper extends BaseMapper<THuifuMch> {
 

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2 - 2
src/main/java/com/szwl/mapper/xml/THuifuMchCheckMapper.xml


+ 2 - 2
src/main/java/com/szwl/mapper/xml/THuifuMchMapper.xml

@@ -22,13 +22,13 @@
         <result column="card_no" property="cardNo" />
         <result column="card_name" property="cardName" />
         <result column="branch_code" property="branchCode" />
-        <result column="sett_mode" property="settMode" />
+        <result column="sett_type" property="settType" />
         <result column="token_no" property="tokenNo" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_date, modify_date, admin_id, huifu_id, reg_name, short_name, type, name, phone, email, cert_no, cert_date, cert_address, card_type, card_no, card_name, branch_code, sett_mode, token_no
+        id, create_date, modify_date, admin_id, huifu_id, reg_name, short_name, type, name, phone, email, cert_no, cert_date, cert_address, card_type, card_no, card_name, branch_code, sett_type, token_no
     </sql>
 
 </mapper>

+ 1 - 1
src/main/java/com/szwl/model/entity/THuifuMch.java

@@ -77,7 +77,7 @@ public class THuifuMch implements Serializable {
     private String branchCode;
 
     @ApiModelProperty(value = "结算方式:1:自动结算,2:手动提现")
-    private Integer settMode;
+    private Integer settType;
 
     @ApiModelProperty(value = "取现卡序列号")
     private String tokenNo;

+ 2 - 2
src/main/java/com/szwl/model/entity/THuifuMchCheck.java

@@ -160,7 +160,7 @@ public class THuifuMchCheck implements Serializable {
     @ApiModelProperty(value = "开户许可证")
     private String regAcctPic;
 
-    @ApiModelProperty(value = "审核状态:“0”为待上传材料图片,“1”为审核中,“2”为审核通过,“3”为审核未通过,“4”为申请修改")
+    @ApiModelProperty(value = "审核状态:“0”为待上传材料图片,“1”为审核中,“2”为审核通过,“3”为审核未通过,“4”为申请撤回")
     private String status;
 
     @ApiModelProperty(value = "审核描述")
@@ -179,7 +179,7 @@ public class THuifuMchCheck implements Serializable {
     private String conStat;
 
     @ApiModelProperty(value = "结算方式:1:自动结算,2:手动提现")
-    private Integer settMode;
+    private Integer settType;
 
 
 }

+ 9 - 9
src/main/java/com/szwl/service/impl/THuifuMchServiceImpl.java

@@ -254,10 +254,10 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
 
 //            settleConfig.put("settle_abstract", "棉花糖机营业收入");
         }
-        Integer settMode = tHuifuMchCheck.getSettMode();
+        Integer settType = tHuifuMchCheck.getSettType();
         settleConfig.put("settle_cycle", "T1");
         JSONArray cashConfig = new JSONArray();
-        if (settMode == 1) {
+        if (settType == 1) {
             // 自动结算
             settleConfig.put("settle_status", "1");
             JSONObject cashConfigValue = new JSONObject();
@@ -266,7 +266,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
             cashConfigValue.put("fee_rate", "0.00");
             cashConfig.add(cashConfigValue);
         }
-        if (settMode == 2) {
+        if (settType == 2) {
             // 手动提现
             settleConfig.put("settle_status", "0");
             JSONObject cashConfigValue = new JSONObject();
@@ -612,9 +612,9 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
         request.put("card_info", cardInfo);
         // 结算方式
         JSONObject settleConfig = new JSONObject();
-        Integer settMode = tHuifuMchCheck.getSettMode();
+        Integer settType = tHuifuMchCheck.getSettType();
         JSONArray cashConfig = new JSONArray();
-        if (settMode == 1) {
+        if (settType == 1) {
             // 自动结算
             settleConfig.put("settle_status", 1);
             settleConfig.put("settle_cycle", "T1");
@@ -623,7 +623,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
             cashConfigValue.put("fee_rate", "0.00");
             cashConfig.add(cashConfigValue);
         }
-        if (settMode == 2) {
+        if (settType == 2) {
             // 手动提现
             settleConfig.put("settle_status", 0);
             settleConfig.put("settle_cycle", "T1");
@@ -756,9 +756,9 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
         }
         request.put("card_info", cardInfo);
         JSONObject settleConfig = new JSONObject();
-        Integer settMode = huifuMchCheck.getSettMode();
+        Integer settType = huifuMchCheck.getSettType();
         JSONArray cashConfig = new JSONArray();
-        if (settMode == 1) {
+        if (settType == 1) {
             // 自动结算
             settleConfig.put("settle_status", "1");
             settleConfig.put("settle_cycle", "T1");
@@ -767,7 +767,7 @@ public class THuifuMchServiceImpl extends ServiceImpl<THuifuMchMapper, THuifuMch
             cashConfigValue.put("fee_rate", "0.00");
             cashConfig.add(cashConfigValue);
         }
-        if (settMode == 2) {
+        if (settType == 2) {
             // 手动提现
             settleConfig.put("settle_status", "0");
             settleConfig.put("settle_cycle", "T1");