From 2bff674480555718b6d7c10dd84783e13e63456a Mon Sep 17 00:00:00 2001
From: "huan.xu" <275942173@qq.com>
Date: Tue, 17 Nov 2020 16:19:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=90=E4=BA=A4=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/blockchain/server/yyyf/feign/EosFeign.java     | 3 ++-
 .../blockchain-server-yyyf/src/main/resources/bootstrap.yml | 5 ++++-
 .../src/main/resources/mapper/AssessUserMapper.xml          | 2 +-
 .../src/main/resources/mapper/AssetsReporterMapper.xml      | 6 +++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/feign/EosFeign.java b/blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/feign/EosFeign.java
index 0b9725a..f374bc7 100644
--- a/blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/feign/EosFeign.java
+++ b/blockchain-server/blockchain-server-yyyf/src/main/java/com/blockchain/server/yyyf/feign/EosFeign.java
@@ -4,11 +4,12 @@ import com.blockchain.common.base.dto.ResultDTO;
 import com.blockchain.server.yyyf.feign.dto.EosWalletDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
 @FeignClient("dapp-eos-server")
 public interface EosFeign {
     @GetMapping("/inner/walletTx/selectWalletByUserOpenId")
-    ResultDTO<List<EosWalletDTO>> selectWalletByWalletType(String userOpenId);
+    ResultDTO<List<EosWalletDTO>> selectWalletByWalletType(@RequestParam("userOpenId") String userOpenId);
 }
diff --git a/blockchain-server/blockchain-server-yyyf/src/main/resources/bootstrap.yml b/blockchain-server/blockchain-server-yyyf/src/main/resources/bootstrap.yml
index b512d4c..ecee1a9 100644
--- a/blockchain-server/blockchain-server-yyyf/src/main/resources/bootstrap.yml
+++ b/blockchain-server/blockchain-server-yyyf/src/main/resources/bootstrap.yml
@@ -22,7 +22,10 @@ spring:
     name: dapp-yyyf-server
 #以渔有方配置
 yyyf:
-  url: http://10.1.129.60:9090/yyyf-server-app
+  #测试环境
+  #url: http://10.1.129.60:9090/yyyf-server-app
+  #线上环境
+  url: http://www.iyyyf.com
   #在线同步
   integral: /api/bd/v1.0/integral
   #成绩同步(单个)
diff --git a/blockchain-server/blockchain-server-yyyf/src/main/resources/mapper/AssessUserMapper.xml b/blockchain-server/blockchain-server-yyyf/src/main/resources/mapper/AssessUserMapper.xml
index 5ca4b33..49536b3 100644
--- a/blockchain-server/blockchain-server-yyyf/src/main/resources/mapper/AssessUserMapper.xml
+++ b/blockchain-server/blockchain-server-yyyf/src/main/resources/mapper/AssessUserMapper.xml
@@ -128,7 +128,7 @@
     <select id="selectCurrentUserTimeMoneyDto" resultMap="UserTimeMoneyDtoMap">
         SELECT au.id,au.user_id,au.q_user_id,au.alipay_init_money,au.wechat_init_money,au.bankcard_init_money,au.start_time,m.wx_pay,m.ali_pay,m.bank_card,m.btc,m.eth,m.usdt,m.eos
         from yyyf_server_assess_user au,yyyf_money m
-        where au.id=m.assess_user_id and au.q_user_id=#{qUserId} and au.id={assessUserId}
+        where au.id=m.assess_user_id and au.q_user_id=#{qUserId} and au.id=#{assessUserId}
     </select>
 
 </mapper>
diff --git a/blockchain-server/blockchain-server-yyyf/src/main/resources/mapper/AssetsReporterMapper.xml b/blockchain-server/blockchain-server-yyyf/src/main/resources/mapper/AssetsReporterMapper.xml
index 858cb31..3c547f5 100644
--- a/blockchain-server/blockchain-server-yyyf/src/main/resources/mapper/AssetsReporterMapper.xml
+++ b/blockchain-server/blockchain-server-yyyf/src/main/resources/mapper/AssetsReporterMapper.xml
@@ -20,11 +20,11 @@
         <foreach collection="list" item="assetsReporter" index="index" separator=",">
             (
             #{assetsReporter.id},
-            #{assetsReporter.assess_user_id},
-            #{assetsReporter.coin_name},
+            #{assetsReporter.assessUserId},
+            #{assetsReporter.coinName},
             #{assetsReporter.days},
             #{assetsReporter.assets},
-            #{assetsReporter.create_time}
+            #{assetsReporter.createTime}
             )
         </foreach>
     </insert>