Merge branch 'v2.0.0' into dev

src/main/java/com/tanpu/fund/api/ProductApi.java

@@ -185,7 +185,7 @@ public interface ProductApi {
     CommonResp<Long> getFundRankCountInfo(@RequestBody FundRankReq req);
 
     @ApiOperation("公募基金模糊匹配")
-    @GetMapping("/public/like")
+    @GetMapping("/private/like")
     CommonResp<List<Type>> getFundLikeShortNameInfo(@Valid @NotEmpty(message = "产品名称不能为空") @RequestParam("productName") String productName,
                                                     Pageable page);
 }

src/main/java/com/tanpu/fund/mapper/generator/custom/FundInfoCustomMapper.java

@@ -55,6 +55,6 @@ public interface FundInfoCustomMapper {
     @Select("select t.id as id, t.fund_name as `value` from ifa_imported_fund_info t where t.id in(${list})")
     List<Type> getSimplePrivateFundList(@Param("list") String list);
 
-    @Select("select t.id as id,t.fund_short_name as value from tx_fund_info t where t.fund_short_name like #{productName}")
+    @Select("select t.id as id,t.fund_short_name as value from fund_info t where t.fund_short_name like #{productName}")
     List<Type> getFundInfoLikeName(@Param("productName") String productName);
 }

src/main/resources/application-test.properties

@@ -10,8 +10,8 @@ management.endpoints.web.base-path = /myhealth
 management.endpoint.health.enabled=true
 management.endpoint.health.show-details=always
 
-spring.datasource.url=jdbc:mysql://118.190.63.109:3306/tamp_fund?autoReconnect=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
-spring.datasource.username=root
+spring.datasource.url=jdbc:mysql://rm-uf6r22t3d798q4kmkao.mysql.rds.aliyuncs.com:3306/tamp_fund?autoReconnect=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&useSSL=false
+spring.datasource.username=tamp_admin
 spring.datasource.password= @imeng123
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 

src/main/resources/mybatis/customize/FundInfoCustomMapper.xml

@@ -41,12 +41,11 @@
         res.ishigh_or_low as ishighOrLow,
         res.tohigh_nav_ratio as tohighNavRatio
         from
-        (SELECT * FROM fund_nav WHERE fund_id in
+        (SELECT fund_id, max(price_date) as price_date FROM fund_nav WHERE fund_id in
         <foreach close=")" collection="list" item="fundId" open="(" separator=",">
             #{fundId}
-        </foreach>
-        order BY price_date desc) res
-        GROUP BY res.fund_id
+        </foreach> GROUP by fund_id) t
+        left join fund_nav res on t.fund_id = res.fund_id and t.price_date = res.price_date
     </select>
 
     <select id="getPrivateFundInfoNewNet" parameterType="java.lang.String" resultType="com.tanpu.fund.entity.generator.FundNav">