浏览代码

修改需求

zhs 3 年之前
父节点
当前提交
9bb049d21e

+ 7 - 4
src/main/java/com/travel/controller/ReleaseTravelController.java

@@ -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);

+ 2 - 0
src/main/java/com/travel/mapper/ReleaseTravelMapper.java

@@ -52,4 +52,6 @@ public interface ReleaseTravelMapper {
     Map<Object, Object> getReleseType(String uuid);
 
     List<OrderingConllection> getTravelConllection(String uuid);
+
+    void bindingTravelUuid(PrivateOrder privateOrder1);
 }

+ 4 - 0
src/main/java/com/travel/model/PrivateOrder.java

@@ -187,4 +187,8 @@ public class PrivateOrder implements Serializable {
      * 供应商头像
      */
     private String releHeadpir;
+    /**
+     * 订单对应的游记编号
+     */
+    private String myOrderingTravelUuid;
 }

+ 2 - 0
src/main/java/com/travel/service/ReleaseTravelService.java

@@ -49,4 +49,6 @@ public interface ReleaseTravelService {
     Map<String, Object> getRoute(HttpServletRequest request);
 
     List<OrderingConllection> getTravelConllection(String uuid);
+
+    void bindingTravelUuid(PrivateOrder privateOrder1);
 }

+ 6 - 0
src/main/java/com/travel/service/impl/ReleaseTravelServiceImpl.java

@@ -145,4 +145,10 @@ public class ReleaseTravelServiceImpl implements ReleaseTravelService {
     public List<OrderingConllection> getTravelConllection(String uuid) {
         return releaseTravelMapperl.getTravelConllection(uuid);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void bindingTravelUuid(PrivateOrder privateOrder1) {
+        releaseTravelMapperl.bindingTravelUuid(privateOrder1);
+    }
 }

+ 4 - 0
src/main/resources/config/mapping/ReleaseTravelMapper.xml

@@ -489,4 +489,8 @@
             left join sys_users b on a.code = b.code
         where ordering_uuid = #{uuid}
     </select>
+    <!-- 插入订单的游记编号 -->
+    <update id="bindingTravelUuid" parameterType="PrivateOrder">
+        update bus_private_ordering set my_ordering_travel_uuid = #{myOrderingTravelUuid} where uuid = #{uuid}
+    </update>
 </mapper>