Jelajahi Sumber

fix:"修复汇付回调接口"

soobin 4 bulan lalu
induk
melakukan
c3212d44ba

+ 4 - 4
src/main/java/com/szwl/controller/CallbackController.java

@@ -65,10 +65,10 @@ public class CallbackController {
     }
 
     @ApiOperation("汇付提现回调")
-    @GetMapping("/withdrawHuifu")
+    @PostMapping("/withdrawHuifu")
+    @ResponseBody
     public String withdrawHuifu(HttpServletRequest request) {
         String respData = request.getParameter("resp_data");
-        String respDesc = request.getParameter("resp_desc");
         log.info("汇付提现回调,参数,respData={}", respData);
         try {
             // 验签请参sign
@@ -80,7 +80,6 @@ public class CallbackController {
                 return "";
             }
             JSONObject data = JSONObject.parseObject(respData);
-
             String transStat = data.getString("trans_stat");
             // 订单号
             String reqSeqId = data.getString("req_seq_id");
@@ -91,13 +90,14 @@ public class CallbackController {
             withdrawalRecord.setStatus(2);
             if (HuifuConstant.RESP_CODE.equals(subRespCode)) {
                 // 业务处理成功
-                if (HuifuConstant.TRANS_STAT_S.equals(transStat)) {
+                if (HuifuConstant.TRANS_STAT_S.equals(transStat) || HuifuConstant.TRANS_STAT_P.equals(transStat)) {
                     withdrawalRecord.setStatus(1);
                 } else {
                     withdrawalRecord.setResultMsg(data.getString("sub_resp_desc"));
                 }
             } else {
                 // 业务处理失败
+                String respDesc = request.getParameter("resp_desc");
                 withdrawalRecord.setResultMsg(respDesc);
             }
             withdrawalRecordService.updateById(withdrawalRecord);

+ 4 - 1
src/main/java/com/szwl/controller/PurseController.java

@@ -149,13 +149,16 @@ public class PurseController {
         if (param.getAdminId() != null) {
             query.eq(WithdrawalRecord::getAdminId, param.getAdminId());
         }
+        if (StringUtils.isNotEmpty(param.getPayPlatform())) {
+            query.eq(WithdrawalRecord::getPayPlatform, param.getPayPlatform());
+        }
         query.orderByDesc(WithdrawalRecord::getCreateDate);
         List<WithdrawalRecord> list = withdrawalRecordService.list(query);
         Workbook workbook = null;
         String head = "提现记录-";
         List<WithdrawTarget> withdrawTargets = withdrawalRecordService.export(list);
         ExportParams exportParams = new ExportParams("提现记录", "sheet1");
-        workbook = ExcelExportUtil.exportExcel(exportParams, SugarDoTarget.class, withdrawTargets);
+        workbook = ExcelExportUtil.exportExcel(exportParams, WithdrawTarget.class, withdrawTargets);
         if (workbook != null) {
             OutputStream os = null;
             try {

+ 0 - 21
src/main/java/com/szwl/controller/THuifuMchCheckController.java

@@ -1,21 +0,0 @@
-package com.szwl.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author wuhs
- * @since 2025-04-17
- */
-@RestController
-@RequestMapping("/tHuifuMchCheck")
-public class THuifuMchCheckController {
-
-}
-

+ 0 - 3
src/main/java/com/szwl/controller/THuifuMchController.java

@@ -217,9 +217,6 @@ public class THuifuMchController {
         JSONObject jsonObject = JSONObject.parseObject(data);
         String auditStatus = jsonObject.getString("audit_status");
         String auditDesc = jsonObject.getString("audit_desc");
-        System.out.println("data:" + data);
-        System.out.println("audit_status:" + auditStatus);
-        System.out.println("audit_desc:" + auditDesc);
         return R.ok().setData(data);
     }