8月1日充值审核接口修改

src/main/java/com/example/demo/controller/bean/BeanAuditController.java

@@ -59,6 +59,7 @@ public class BeanAuditController {
 
             return beanAuditService.updateStatus1(beanAuditInfo.getId());
         } catch (Exception e) {
+            e.printStackTrace();
             return Result.error("更新失败,查看id");
         }
     }

src/main/java/com/example/demo/controller/bean/BeanRechargeController.java

@@ -12,6 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @program: gold-java
  * @ClassName BeanRechrageController

src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java

@@ -9,6 +9,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -37,6 +38,11 @@ public class BeanAuditServiceImpl implements BeanAuditService {
     @Autowired
     private RestTemplate restTemplate;
 
+
+    // 2. 构建接口URL及参数
+    @Value("${file.upload.url}")
+    String apiUrl;
+
     //查找审核信息
     @Override
     public PageInfo<BeanAuditInfo> selectBy(Integer pageNum, Integer pageSize, BeanAuditInfo beanAuditInfo) {
@@ -54,21 +60,32 @@ public class BeanAuditServiceImpl implements BeanAuditService {
         String content = beanAuditInfo.getRemark(); // 备注作为content参数
         String orderNo = UUID.randomUUID().toString().replace("-", ""); // 生成唯一订单号（去除横线）
 
-        // 2. 构建接口URL及参数
-        String apiUrl = "http://47.92.148.30:3003/mock/61/hljw/api/user/gold";
-        UriComponentsBuilder urlBuilder = UriComponentsBuilder.fromHttpUrl(apiUrl)
+
+        UriComponentsBuilder urlBuilder1 = UriComponentsBuilder.fromHttpUrl(apiUrl)
+                .queryParam("jwcode", jwcode)
+                .queryParam("op", op)
+                .queryParam("gold", beanAuditInfo.getFreeBean())
+                .queryParam("content", content);
+
+        UriComponentsBuilder urlBuilder2 = UriComponentsBuilder.fromHttpUrl(apiUrl)
                 .queryParam("jwcode", jwcode)
                 .queryParam("op", op)
                 .queryParam("gold", beanAuditInfo.getPermanentBean())
                 .queryParam("content", content)
                 .queryParam("order_no", orderNo);
+        // 3. 发送GET请求
+        ResponseEntity<String> response1 = restTemplate.getForEntity(urlBuilder1.toUriString(), String.class);
 
+        // 4. 处理响应结果
+        if (!response1.getStatusCode().is2xxSuccessful()) {
+            return Result.error("免费远程接口调用失败，状态码：" + response1.getStatusCodeValue());
+        }
         // 3. 发送GET请求
-        ResponseEntity<String> response = restTemplate.getForEntity(urlBuilder.toUriString(), String.class);
+        ResponseEntity<String> response2 = restTemplate.getForEntity(urlBuilder2.toUriString(), String.class);
 
         // 4. 处理响应结果
-        if (!response.getStatusCode().is2xxSuccessful()) {
-            return Result.error("远程接口调用失败，状态码：" + response.getStatusCodeValue());
+        if (!response2.getStatusCode().is2xxSuccessful()) {
+            return Result.error("付费远程接口调用失败，状态码：" + response2.getStatusCodeValue());
         }
         beanAuditMapper.updateStatus1(id);
         return Result.success();

src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java

@@ -16,7 +16,6 @@ import com.example.demo.domain.entity.Export;
 import com.example.demo.domain.entity.User;
 import com.example.demo.domain.export.Goldmingxi;
 import com.example.demo.domain.vo.bean.BeanConsumeLive;
-import com.example.demo.domain.vo.bean.BeanPage;
 import com.example.demo.domain.vo.coin.*;
 
 import com.example.demo.mapper.coin.ExportMapper;

src/main/resources/application-dev.yml

@@ -53,7 +53,7 @@ feishu:
       url: https://open.feishu.cn/open-apis/bot/v2/hook/384c78aa-8df1-498b-9c47-04e890ed9877
 
 server:
-  port: 10704
+  port: 8081
 
   logging:
     level:

src/main/resources/application-prod.yml

@@ -53,7 +53,8 @@ feishu:
   webhook:
     url: https://open.feishu.cn/open-apis/bot/v2/hook/1a515b19-b64f-46b7-9486-35842b9539fe
 
-
+bean:
+  url: http://47.92.148.30:3003/mock/61/hljw/api/user/gold
 
 server:
   port: 8081

src/main/resources/application-test.yml

@@ -53,7 +53,8 @@ feishu:
   webhook:
     url: https://open.feishu.cn/open-apis/bot/v2/hook/384c78aa-8df1-498b-9c47-04e890ed9877
 
-
+bean:
+  url: http://47.92.148.30:3003/mock/61/hljw/api/user/gold
 
 server:
   port: 8081

src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: dev
   jackson:
     deserialization:
       fail-on-unknown-properties: false
@@ -86,7 +86,8 @@ upload:
 file:
   upload:
     url: http://39.101.133.168:8828/hljw/api/aws/upload
-
+bean:
+  url: http://47.92.148.30:3003/mock/61/hljw/api/user/gold
 
 server:
   port: 8081

src/main/resources/mapper/BeanAuditMapper.xml

@@ -82,13 +82,12 @@
 
     <select id="selectById" resultType="com.example.demo.domain.vo.bean.BeanAuditInfo">
         select
-               a.jwcode AS jwcode,
-               m.name AS market,
-               a.buy_jd AS permanentBean,
-               a.free_jd AS freeBean,
-               a.remark AS remark,
-               a.admin_name AS submitName,
-               a.audit_name AS auditName
+               jwcode AS jwcode,
+               buy_jd AS permanentBean,
+               free_jd AS freeBean,
+               remark AS remark,
+               admin_name AS submitName,
+               audit_name AS auditName
         from audit where id = #{id}
     </select>
 </mapper>