From ef5fd9f17077b593e417ebeb42f767bb543a96eb Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Fri, 1 Aug 2025 17:05:54 +0800 Subject: [PATCH] =?UTF-8?q?8=E6=9C=881=E6=97=A5=E5=85=85=E5=80=BC=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/bean/BeanAuditController.java | 1 + .../controller/bean/BeanRechargeController.java | 2 ++ .../serviceImpl/bean/BeanAuditServiceImpl.java | 29 +++++++++++++++++----- .../serviceImpl/coin/ExportExcelServiceImpl.java | 1 - src/main/resources/application-dev.yml | 2 +- src/main/resources/application-prod.yml | 3 ++- src/main/resources/application-test.yml | 3 ++- src/main/resources/application.yml | 5 ++-- src/main/resources/mapper/BeanAuditMapper.xml | 13 +++++----- 9 files changed, 40 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/example/demo/controller/bean/BeanAuditController.java b/src/main/java/com/example/demo/controller/bean/BeanAuditController.java index ac891df..4ee2860 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanAuditController.java +++ b/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"); } } diff --git a/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java b/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java index dc5e00a..47194af 100644 --- a/src/main/java/com/example/demo/controller/bean/BeanRechargeController.java +++ b/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 diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java index aa81d00..57b83fe 100644 --- a/src/main/java/com/example/demo/serviceImpl/bean/BeanAuditServiceImpl.java +++ b/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 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 response1 = restTemplate.getForEntity(urlBuilder1.toUriString(), String.class); + // 4. 处理响应结果 + if (!response1.getStatusCode().is2xxSuccessful()) { + return Result.error("免费远程接口调用失败，状态码：" + response1.getStatusCodeValue()); + } // 3. 发送GET请求 - ResponseEntity response = restTemplate.getForEntity(urlBuilder.toUriString(), String.class); + ResponseEntity 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(); diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java index 06233fe..29c3499 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ExportExcelServiceImpl.java +++ b/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; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 041d0b5..9e0b8a1 100644 --- a/src/main/resources/application-dev.yml +++ b/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: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index f1d908d..bd2fa29 100644 --- a/src/main/resources/application-prod.yml +++ b/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 diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 482564f..17db5f5 100644 --- a/src/main/resources/application-test.yml +++ b/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 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e7061c3..67f6b96 100644 --- a/src/main/resources/application.yml +++ b/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 diff --git a/src/main/resources/mapper/BeanAuditMapper.xml b/src/main/resources/mapper/BeanAuditMapper.xml index affe02d..f2ea51d 100644 --- a/src/main/resources/mapper/BeanAuditMapper.xml +++ b/src/main/resources/mapper/BeanAuditMapper.xml @@ -82,13 +82,12 @@ \ No newline at end of file