|
|
@@ -39,6 +39,9 @@ public class ReleaseTravelController {
|
|
|
try{
|
|
|
//从定制单获得数据存入游记中
|
|
|
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ //生成uuid
|
|
|
+ String id = UUID.randomUUID().toString().replace("-", "");
|
|
|
+ travel.setUuid(id);
|
|
|
//选择订单增加游记 如果不选择订单则不需要查询订单
|
|
|
if(null != travel.getId()){
|
|
|
PrivateOrder privateOrder = releaseTravelService.getTravelVal(travel.getId());
|
|
|
@@ -51,11 +54,11 @@ public class ReleaseTravelController {
|
|
|
.setDemandUuid(privateOrder.getUuid())
|
|
|
.setReleaseUuid(travel.getId())
|
|
|
.setAmount(privateOrder.getPriceAll());
|
|
|
- }
|
|
|
- //生成uuid
|
|
|
- String id = UUID.randomUUID().toString().replace("-", "");
|
|
|
+ //订单绑定游记编号
|
|
|
+ PrivateOrder privateOrder1 = new PrivateOrder().setUuid(travel.getId()).setMyOrderingTravelUuid(travel.getUuid());
|
|
|
+ releaseTravelService.bindingTravelUuid(privateOrder1);
|
|
|
|
|
|
- travel.setUuid(id);
|
|
|
+ }
|
|
|
//新增每天游记内容 多个每日游记处理
|
|
|
if(travel.getTravelArrayString() != null && travel.getTravelArrayString() != ""){
|
|
|
List<TravelExperience> list = JSONArray.parseArray(travel.getTravelArrayString(), TravelExperience.class);
|