修改需求

src/main/java/com/travel/controller/PersonalController.java

@@ -203,6 +203,7 @@ public class PersonalController {
                 // 生成jwt的令牌
                 String token = JWTUtil.getToken(payload);
                 user1.setToken(token);
+                user1.setPhone(DesDecry.decrypt(user1.getPhone()));
                 map.put("data", user1);
                 map.put("msg", "200");
             } else {

src/main/java/com/travel/controller/ReleaseTravelController.java

@@ -39,16 +39,19 @@ public class ReleaseTravelController {
         try{
             //从定制单获得数据存入游记中
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-            PrivateOrder privateOrder = releaseTravelService.getTravelVal(travel.getId());
-            travel.setDestination(privateOrder.getDestination())
+            //选择订单增加游记 如果不选择订单则不需要查询订单
+            if(null != travel.getId()){
+                PrivateOrder privateOrder = releaseTravelService.getTravelVal(travel.getId());
+                travel.setDestination(privateOrder.getDestination())
 //                    .setCapita(Integer.parseInt(df.format(Integer.parseInt(privateOrder.getPriceAll()) / Integer.parseInt(privateOrder.getPeopleAll()))))
-                    .setCapita(String.format("%.2f", (Double.parseDouble(privateOrder.getPriceAll()) / Double.parseDouble(privateOrder.getPeopleAll()))))
-                    .setTravelDate(privateOrder.getStartTime() + "~" + privateOrder.getEndTime())
-                    .setTravelDay(((format.parse(privateOrder.getEndTime()).getTime() - format.parse(privateOrder.getStartTime()).getTime()) / (24 * 60 * 60 * 1000)) + 1 + "")
-                    .setPeopleAll(privateOrder.getPeopleAll())
-                    .setDemandUuid(privateOrder.getUuid())
-                    .setReleaseUuid(travel.getId())
-                    .setAmount(privateOrder.getPriceAll());
+                        .setCapita(String.format("%.2f", (Double.parseDouble(privateOrder.getPriceAll()) / Double.parseDouble(privateOrder.getPeopleAll()))))
+                        .setTravelDate(privateOrder.getStartTime() + "~" + privateOrder.getEndTime())
+                        .setTravelDay(((format.parse(privateOrder.getEndTime()).getTime() - format.parse(privateOrder.getStartTime()).getTime()) / (24 * 60 * 60 * 1000)) + 1 + "")
+                        .setPeopleAll(privateOrder.getPeopleAll())
+                        .setDemandUuid(privateOrder.getUuid())
+                        .setReleaseUuid(travel.getId())
+                        .setAmount(privateOrder.getPriceAll());
+            }
             //生成uuid
             String id = UUID.randomUUID().toString().replace("-", "");