浏览代码

fix some bug

Mr.qian 3 天之前
父节点
当前提交
ab78e90454

+ 6 - 12
cif-service/src/main/java/com/txz/cif/web/RechargeRecordApiController.java

@@ -30,7 +30,6 @@ import com.txz.cif.web.para.RecordParam;
 import com.txz.cif.web.ro.TFPayNotifyDTO;
 import com.txz.cif.web.vo.CreatePayVO;
 import com.txz.cif.web.vo.PaymentPriceVO;
-import com.txz.cif.web.vo.UnpaidOrderVO;
 import com.txz.core.ServiceException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -111,15 +110,16 @@ public class RechargeRecordApiController {
      * 充值未完成订单
      */
     @GetMapping("unpaidOrder")
-    public Result<UnpaidOrderVO> unpaidOrder(HttpServletRequest request) {
+    public Result<Boolean> unpaidOrder(HttpServletRequest request) {
         Condition condition = new Condition(RechargeRecord.class);
         Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("status", 1);
-        criteria.andEqualTo("userId", authService.getTokenUserId(request));
+        criteria.andEqualTo("userId", 3);
+        // criteria.andEqualTo("userId", authService.getTokenUserId(request));
         condition.setOrderByClause("create_time desc");
         List<RechargeRecord> list = rechargeRecordService.findByCondition(condition);
         if (CollectionUtil.isEmpty(list)) {
-            return Result.success();
+            return Result.success(Boolean.FALSE);
         }
         RechargeRecord rechargeRecord = list.get(0);
         
@@ -130,15 +130,9 @@ public class RechargeRecordApiController {
         criteriaBiz.andIsNotNull("receiveMessage");
         List<BizLog> bizCondition = bizLogService.findByCondition(conditionBiz);
         if (CollectionUtil.isEmpty(bizCondition)) {
-            return Result.success();
+            return Result.success(Boolean.FALSE);
         }
-        JSONObject receiveJson = JSONUtil.parseObj(bizCondition.get(0).getReceiveMessage());
-        
-        JSONObject sendJson = JSONUtil.parseObj(bizCondition.get(0).getSendMessage());
-        return Result.success(UnpaidOrderVO.builder()
-                .amount(sendJson.getStr("pay_amount"))
-                .payUrl(receiveJson.getStr("data"))
-                .build());
+        return Result.success(Boolean.TRUE);
     }
     
     /**

+ 0 - 24
cif-service/src/main/java/com/txz/cif/web/vo/UnpaidOrderVO.java

@@ -1,24 +0,0 @@
-package com.txz.cif.web.vo;
-
-import lombok.Builder;
-import lombok.Data;
-
-/**
- * @author: MTD®️
- * @date: 2025/9/2
- */
-@Data
-@Builder
-public class UnpaidOrderVO {
-    
-    /**
-     * 充值金额
-     */
-    private String amount;
-    
-    /**
-     * 支付连接
-     */
-    private String payUrl;
-    
-}