From 545d3a5024f54976a6685a30c7c1a4107fd5d563 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 19 Dec 2024 17:50:05 +0800
Subject: [PATCH] fix(mall): 修复会员兑换碳币权限及数据展示问题- 修改会员兑换碳币权限判断逻辑，使用 withdrawState 替代 changeState - 调整 ApiRunDataVo 中 score 和 realScore 字段含义，确保数据展示正确 - 更新 buyVipList.html 中状态颜色，以更直观地显示不同状态
---
pom.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3f933da..ae352f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,43 @@
</properties>
<dependencies>
+
+ <!-- 区块链模块-->
+ <dependency>
+ <groupId>org.web3j</groupId>
+ <artifactId>core</artifactId>
+ <version>4.5.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>logging-interceptor</artifactId>
+ <version>3.6.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.web3j</groupId>
+ <artifactId>parity</artifactId>
+ <version>4.5.10</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>core</artifactId>
+ <groupId>org.web3j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>1.68</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>1.68</version>
+ </dependency>
<!-- 短信模块-->
<dependency>
<groupId>com.infobip</groupId>
@@ -40,16 +77,16 @@
<artifactId>json</artifactId>
<version>20230618</version>
</dependency>
- <dependency>
- <groupId>com.github.wechatpay-apiv3</groupId>
- <artifactId>wechatpay-apache-httpclient</artifactId>
- <version>0.4.7</version>
- </dependency>
- <dependency>
- <groupId>com.github.wechatpay-apiv3</groupId>
- <artifactId>wechatpay-java</artifactId>
- <version>0.2.12</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.github.wechatpay-apiv3</groupId>-->
+<!-- <artifactId>wechatpay-apache-httpclient</artifactId>-->
+<!-- <version>0.4.7</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.github.wechatpay-apiv3</groupId>-->
+<!-- <artifactId>wechatpay-java</artifactId>-->
+<!-- <version>0.2.12</version>-->
+<!-- </dependency>-->
<!-- 图片压缩-->
<dependency>
<groupId>net.coobird</groupId>
--
Gitblit v1.9.1