zhs 3 роки тому
батько
коміт
5c3a36f562

+ 2 - 1
src/main/java/com/travel/controller/ReleaseTravelController.java

@@ -45,7 +45,8 @@ public class ReleaseTravelController {
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
             PrivateOrder privateOrder = releaseTravelService.getTravelVal(travel.getId());
             travel.setDestination(privateOrder.getDestination())
-                    .setCapita(Integer.parseInt(df.format(Integer.parseInt(privateOrder.getPriceAll()) / Integer.parseInt(privateOrder.getPeopleAll()))))
+//                    .setCapita(Integer.parseInt(df.format(Integer.parseInt(privateOrder.getPriceAll()) / Integer.parseInt(privateOrder.getPeopleAll()))))
+                    .setCapita(Integer.parseInt(String.valueOf(Integer.parseInt(privateOrder.getPriceAll()) / Integer.parseInt(privateOrder.getPeopleAll()))))
                     .setTravelDate(privateOrder.getStartTime() + "~" + privateOrder.getEndTime())
                     .setTravelDay(((format.parse(privateOrder.getEndTime()).getTime() - format.parse(privateOrder.getStartTime()).getTime()) / (24 * 60 * 60 * 1000)) + "")
                     .setPeopleAll(privateOrder.getPeopleAll())

+ 2 - 2
src/main/resources/config/mapping/IndexMapper.xml

@@ -27,8 +27,8 @@
         select
             *,
             article_id as id,
-            article_title as titleName,
-            article_title2 as viceTitleName,
+            article_title2 as titleName,
+            article_digest as viceTitleName,
             article_id as uuid
         from tuya_article_info
         <trim prefix="WHERE" prefixOverrides="and | or">