接口增加修改

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

@@ -53,6 +53,8 @@ public class PrivateOrderController {
         return map;
     }
 
+
+
     /**
      * 查询私人订制
      * @param privateOrder 参数
@@ -79,6 +81,10 @@ public class PrivateOrderController {
                     //查询
                     for(PrivateOrder privateOrder1 : privateOrderService.getPrivate(privateOrder)){
                         list.add(privateOrder1);
+                        //查询每日信息
+                        privateOrder1.setReleaseDay(privateOrderService.getSupplierReleaseDay(privateOrder1.getUuidRele()));
+                        //查询游玩游戏
+                        privateOrder1.setReleasePlay(privateOrderService.getSupplierReleasePlay(privateOrder1.getUuidRele()));
                     }
                 }
             }
@@ -159,6 +165,32 @@ public class PrivateOrderController {
         return map;
     }
 
+    /**
+     * 查询指定报价单内容
+     * @param release 参数
+     * @return 返回结果
+     */
+    @GetMapping("getPrivateId")
+    public Map<String, Object> interestedPrivate(Release release){
+        Map<String, Object> map = new HashMap<>();
+        try{
+            List<Release> list = privateOrderService.getReleaseHot(release);
+            for(int i = 0; i < list.size(); i++){
+                //查询每日信息
+                list.get(i).setReleaseDay(privateOrderService.getSupplierReleaseDay(list.get(i).getUuid()));
+                //查询游玩游戏
+                list.get(i).setReleasePlay(privateOrderService.getSupplierReleasePlay(list.get(i).getUuid()));
+            }
+            map.put("data", list);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
     /**
      * 删除私人定制
      * @param privateOrder 参数
@@ -166,21 +198,23 @@ public class PrivateOrderController {
      * @return 返回结果
      */
     @DeleteMapping("delPrivate")
-    public Map<String, Object> delPrivate(@RequestBody PrivateOrder privateOrder, HttpServletRequest request){
+    public Map<String, Object> delPrivate(@RequestBody Release release, HttpServletRequest request){
         Map<String, Object> map = new HashMap<>();
         try{
+            release.setOrderType(9);
+            privateOrderService.notInterested(release);//修改定制单状态
             //获取token
-            Map<String, Object> userMap = ParsingToken.tokenParsing(request);
-            privateOrder.setCode((String) userMap.get("code"));
-            privateOrderService.delPrivate(privateOrder);//删除定制单
-            privateOrderService.delPrivateType(privateOrder);//删除定制单状态
-
-            List<Map<String, Object>> list = privateOrderService.getPrivateRelase(privateOrder);//查询指定定制单的报价单
-            for(Map mapVal : list){
-                privateOrderService.delPrivateRelase(mapVal.get("uuid").toString());//删除报价单
-                privateOrderService.delPrivateReleDay(mapVal.get("uuid").toString());//删除报价单天信息
-                privateOrderService.delPrivateRelePlay(mapVal.get("uuid").toString());//删除报价单游玩信息
-            }
+//            Map<String, Object> userMap = ParsingToken.tokenParsing(request);
+//            privateOrder.setCode((String) userMap.get("code"));
+//            privateOrderService.delPrivate(privateOrder);//删除定制单
+//            privateOrderService.delPrivateType(privateOrder);//删除定制单状态
+//
+//            List<Map<String, Object>> list = privateOrderService.getPrivateRelase(privateOrder);//查询指定定制单的报价单
+//            for(Map mapVal : list){
+//                privateOrderService.delPrivateRelase(mapVal.get("uuid").toString());//删除报价单
+//                privateOrderService.delPrivateReleDay(mapVal.get("uuid").toString());//删除报价单天信息
+//                privateOrderService.delPrivateRelePlay(mapVal.get("uuid").toString());//删除报价单游玩信息
+//            }
 
             map.put("msg", "200");
         }catch (Exception e){
@@ -243,4 +277,23 @@ public class PrivateOrderController {
         }
         return map;
     }
+
+    /**
+     * 不感兴趣
+     * @return
+     */
+    @PutMapping ("notInterested")
+    public Map<String, Object> notInterested(@RequestBody Release release){
+        Map<String, Object> map = new HashMap<>();
+        try{
+            release.setOrderType(6);
+            privateOrderService.notInterested(release);
+            map.put("msg", "200");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
 }

src/main/java/com/travel/mapper/PrivateOrderMapper.java

@@ -47,4 +47,6 @@ public interface PrivateOrderMapper {
     List<SupplierReleaseDay> getSupplierReleaseDay(String uuid);
 
     List<SupplierReleasePlay> getSupplierReleasePlay(String uuid);
+
+    void notInterested(Release release);
 }

src/main/java/com/travel/model/PrivateOrder.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 私人订制
@@ -147,4 +148,12 @@ public class PrivateOrder implements Serializable {
      * 报价单id
      */
     private String uuidRele;
+    /**
+     * 天集合数据
+     */
+    private List<SupplierReleaseDay> releaseDay;
+    /**
+     * 游玩集合数据
+     */
+    private List<SupplierReleasePlay> releasePlay;
 }

src/main/java/com/travel/model/Release.java

@@ -73,4 +73,16 @@ public class Release implements Serializable {
      * 用户编号
      */
     private String code;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 头型
+     */
+    private String headpir;
+    /**
+     * 状态
+     */
+    private int orderType;
 }

src/main/java/com/travel/service/PrivateOrderService.java

@@ -45,4 +45,6 @@ public interface PrivateOrderService {
     List<SupplierReleaseDay> getSupplierReleaseDay(String uuid);
 
     List<SupplierReleasePlay> getSupplierReleasePlay(String uuid);
+
+    void notInterested(Release release);
 }

src/main/java/com/travel/service/impl/PrivateOrderServiceImpl.java

@@ -124,4 +124,10 @@ public class PrivateOrderServiceImpl implements PrivateOrderService {
     public List<SupplierReleasePlay> getSupplierReleasePlay(String uuid) {
         return privateOrderMapper.getSupplierReleasePlay(uuid);
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void notInterested(Release release) {
+        privateOrderMapper.notInterested(release);
+    }
 }

src/main/resources/config/mapping/PrivateOrderMapper.xml

@@ -12,20 +12,19 @@
     <!-- 查询私人订制 -->
     <select id="getPrivate" resultType="PrivateOrder">
         SELECT
-            top ${limit} b.*,c.uuid as uuidRele,c.*,a.order_type as orderType
+            b.*,c.uuid as uuidRele,c.*,a.order_type as orderType
         FROM
             bus_private_ordering AS b
             LEFT JOIN bus_supplier_release c ON b.uuid = c.demand_uuid
             JOIN bus_private_ordering_type a on order_type = #{orderType} and b.uuid = a.demand_uuid
-        WHERE
-            b.id not in (select top ${page} id  from bus_private_ordering )
+        <trim prefix="WHERE" prefixOverrides="and | or">
             <if test="uuid != null and uuid != ''">
                 and b.uuid = #{uuid}
             </if>
             <if test="code != null and code != ''">
                 and b.code = #{code}
             </if>
-            order by b.id
+        </trim>
     </select>
     <!-- 查询私人订制 -->
     <select id="getPrivateAll" resultType="PrivateOrder">
@@ -79,20 +78,19 @@
     <!-- 查询私人订制零带Code -->
     <select id="getPrivateZeroCode" resultType="PrivateOrder">
         SELECT
-        top ${limit} b.*,c.uuid as uuidRele,0 as orderType,c.*
+        b.*,c.uuid as uuidRele,0 as orderType,c.*,c.uuid as uuidRele
         FROM
         bus_private_ordering AS b
         LEFT JOIN bus_supplier_release c ON b.uuid = c.demand_uuid
         JOIN ( SELECT code,uuid FROM bus_private_ordering WHERE uuid NOT IN ( SELECT demand_uuid FROM bus_private_ordering_type WHERE order_type != 0 ) ) AS d ON b.uuid = d.uuid
-        WHERE
-        b.id not in (select top ${page} id  from bus_private_ordering )
-        <if test="uuid != null and uuid != ''">
-            and b.uuid = #{uuid}
-        </if>
-        <if test="code != null and code != ''">
-            and b.code = #{code}
-        </if>
-        order by b.id
+        <trim prefix="WHERE" prefixOverrides="and | or">
+            <if test="uuid != null and uuid != ''">
+                and b.uuid = #{uuid}
+            </if>
+            <if test="code != null and code != ''">
+                and b.code = #{code}
+            </if>
+        </trim>
     </select>
     <!-- 查询定制单哪些超出出行时间 修改状态 -->
     <select id="updatePrivate" parameterType="PrivateOrder" resultType="PrivateOrder">
@@ -133,14 +131,23 @@
             b.origin,
             b.destination,
             b.start_time,
+            b.uuid as demandUuid,
             b.end_time,
             f.collectionNum,
-            g.conllectionCount
+            g.conllectionCount,
+            e.name,
+            e.headpir
         FROM
             bus_supplier_release a
-                LEFT JOIN bus_private_ordering b ON a.demand_uuid = b.uuid
-                LEFT JOIN ( SELECT COUNT ( * ) AS collectionNum, ordering_uuid FROM bus_collection WHERE type = '0' AND code = #{code} GROUP BY ordering_uuid ) f ON a.uuid = f.ordering_uuid
-                LEFT JOIN ( SELECT COUNT ( * ) AS conllectionCount, ordering_uuid FROM bus_collection WHERE type = '0' GROUP BY ordering_uuid ) g ON a.uuid = g.ordering_uuid
+            LEFT JOIN bus_private_ordering b ON a.demand_uuid = b.uuid
+            LEFT JOIN ( SELECT COUNT ( * ) AS collectionNum, ordering_uuid FROM bus_collection WHERE type = '0' AND code = #{code} GROUP BY ordering_uuid ) f ON a.uuid = f.ordering_uuid
+            LEFT JOIN ( SELECT COUNT ( * ) AS conllectionCount, ordering_uuid FROM bus_collection WHERE type = '0' GROUP BY ordering_uuid ) g ON a.uuid = g.ordering_uuid
+            LEFT JOIN sys_supplier e ON a.code = e.code
+        <trim prefix="WHERE" prefixOverrides="and | or">
+            <if test="uuid != null and uuid != ''">
+                a.uuid = #{uuid}
+            </if>
+        </trim>
     </select>
     <!-- 查询供应商路线每天信息 -->
     <select id="getSupplierReleaseDay" resultType="SupplierReleaseDay">
@@ -150,4 +157,16 @@
     <select id="getSupplierReleasePlay" resultType="SupplierReleasePlay">
         select * from bus_supplier_release_play where uuid = #{uuid} order by day_num
     </select>
+    <!-- 不感兴趣/取消行程 -->
+    <update id="notInterested" parameterType="Release">
+        update bus_private_ordering_type set order_type=#{orderType}
+        <trim prefix="WHERE" prefixOverrides="and | or">
+            <if test="code != null and code != ''">
+                and code = #{code}
+            </if>
+            <if test="demandUuid != null and demandUuid != ''">
+                and demand_uuid = #{demandUuid}
+            </if>
+        </trim>
+    </update>
 </mapper>