分支合并

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,7 +110,7 @@ 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);
@@ -119,7 +118,7 @@ public class RechargeRecordApiController {
         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,21 +129,15 @@ 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);
     }
     
     /**
      * 充值订单二次三方支付
      */
-    @GetMapping("thirdPayAgree/{recordId:^\\d+$}")
+    @GetMapping("thirdPayAgree/{paymentId:^\\d+$}")
     public Result thirdPayAgree(@PathVariable("paymentId") Long paymentId, HttpServletRequest request) {
         Condition condition = new Condition(RechargeRecord.class);
         Criteria criteria = condition.createCriteria();
@@ -307,7 +300,7 @@ public class RechargeRecordApiController {
             if (ObjectUtil.isEmpty(record)) {
                 return "FAIL";
             }
-            if (record.getStatus() == 2) {
+            if (record.getStatus() == 2 || record.getStatus() == 3) {
                 return "FAIL";
             }
             record.setRealAmount(new BigDecimal(dto.getAmount()));

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

cif-service/src/main/resources/bootstrap.properties

@@ -5,8 +5,8 @@ project.version=1.03
 #spring.mvc.throw-exception-if-no-handler-found=true
 #spring.resources.add-mappings=true
 spring.profiles.active=dev
-local.nacos=127.0.0.1:8848
-dev.nacos=127.0.0.1:8848
+local.nacos=172.17.0.3:8848
+dev.nacos=172.17.0.3:8848
 test.nacos=172.10.100.40:30848
 pro.nacos=172.10.100.10:30308
 spring.cloud.nacos.discovery.server-addr=${${spring.profiles.active}.nacos}
@@ -66,7 +66,7 @@ dubbo.service.max.thread.pool.size=200
 #management.endpoint.shutdown.enabled=true
 #management.endpoints.web.base-path=/${spring.application.name}
 #management.endpoints.web.path-mapping.shutdown=/shutThisBoot
-#management.server.address=127.0.0.1
+#management.server.address=172.17.0.3
 dubbo.protocol.serialization=kryo
 dubbo.protocol.optimizer=
 server.undertow.worker-threads=256