收藏

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

@@ -1,5 +1,6 @@
 package com.travel.controller;
 
+import com.travel.model.OrderingConllection;
 import com.travel.model.PrivateOrder;
 import com.travel.service.PrivateOrderService;
 import com.travel.util.ParsingToken;
@@ -28,8 +29,7 @@ public class PrivateOrderController {
      * @return 返回结果
      */
     @PostMapping("insertPrivate")
-    @ResponseBody
-    public Map<String, Object> insertPrivate(PrivateOrder privateOrder, HttpServletRequest request){
+    public Map<String, Object> insertPrivate(@RequestBody PrivateOrder privateOrder, HttpServletRequest request){
         Map<String, Object> map = new HashMap<>();
         //获取token
         Map<String, Object> userMap = ParsingToken.tokenParsing(request);
@@ -71,6 +71,28 @@ public class PrivateOrderController {
         return map;
     }
 
+
+    /**
+     * 查询私人订制列表
+     * @param privateOrder 参数
+     * @param request 参数
+     * @return 返回结果
+     */
+    @GetMapping("getPrivateAll")
+    public Map<String, Object> getPrivateAll(PrivateOrder privateOrder, HttpServletRequest request){
+        Map<String, Object> map = new HashMap<>();
+        try{
+            //查询
+            List<PrivateOrder> list = privateOrderService.getPrivateAll(privateOrder);
+            map.put("data", list);
+            map.put("msg", "200");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+        }
+        return map;
+    }
+
     /**
      * 删除私人定制
      * @param privateOrder 参数
@@ -92,4 +114,29 @@ public class PrivateOrderController {
         }
         return map;
     }
+
+    /**
+     * 新增收藏
+     * @param orderingConllection 参数
+     * @return 返回结果
+     */
+    @PostMapping("addCollection")
+    public Map<String, Object> addCollection(OrderingConllection orderingConllection, HttpServletRequest request){
+        Map<String, Object> map = new HashMap<>();
+        try {
+            //获取token
+            Map<String, Object> userMap = ParsingToken.tokenParsing(request);
+            orderingConllection.setCode((String) userMap.get("code"));
+            //生成uuid
+            String id = UUID.randomUUID().toString().replace("-", "");
+            orderingConllection.setUuid(id);
+
+            privateOrderService.addCollection(orderingConllection);
+            map.put("msg", "200");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+        }
+        return map;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.travel.mapper;
 
+import com.travel.model.OrderingConllection;
 import com.travel.model.PrivateOrder;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -12,4 +13,8 @@ public interface PrivateOrderMapper {
     List<PrivateOrder> getPrivate(PrivateOrder privateOrder);
 
     void delPrivate(PrivateOrder privateOrder);
+
+    List<PrivateOrder> getPrivateAll(PrivateOrder privateOrder);
+
+    void addCollection(OrderingConllection orderingConllection);
 }

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

@@ -0,0 +1,35 @@
+package com.travel.model;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 收藏定制
+ */
+@Data
+@Accessors(chain = true)
+@SuppressWarnings("serial")
+public class OrderingConllection implements Serializable {
+    /**
+     * 主键自增
+     */
+    private String id;
+    /**
+     * 用户编号
+     */
+    private String code;
+    /**
+     * 定制编号
+     */
+    private String uuid;
+    /**
+     * 建档日期
+     */
+    private String jdrq;
+    /**
+     * 定制编号
+     */
+    private String orderingUuid;
+}

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

@@ -1,5 +1,6 @@
 package com.travel.service;
 
+import com.travel.model.OrderingConllection;
 import com.travel.model.PrivateOrder;
 
 import java.util.List;
@@ -10,4 +11,8 @@ public interface PrivateOrderService {
     List<PrivateOrder> getPrivate(PrivateOrder privateOrder);
 
     void delPrivate(PrivateOrder privateOrder);
+
+    List<PrivateOrder> getPrivateAll(PrivateOrder privateOrder);
+
+    void addCollection(OrderingConllection orderingConllection);
 }

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

@@ -1,6 +1,7 @@
 package com.travel.service.impl;
 
 import com.travel.mapper.PrivateOrderMapper;
+import com.travel.model.OrderingConllection;
 import com.travel.model.PrivateOrder;
 import com.travel.service.PrivateOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,4 +32,15 @@ public class PrivateOrderServiceImpl implements PrivateOrderService {
     public void delPrivate(PrivateOrder privateOrder) {
         privateOrderMapper.delPrivate(privateOrder);
     }
+
+    @Override
+    public List<PrivateOrder> getPrivateAll(PrivateOrder privateOrder) {
+        return privateOrderMapper.getPrivateAll(privateOrder);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addCollection(OrderingConllection orderingConllection) {
+        privateOrderMapper.addCollection(orderingConllection);
+    }
 }

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

@@ -7,7 +7,7 @@
         insert into
             bus_private_ordering(code,origin,destination,start_time,end_time,people_num,jdrq,people_all,budget_min,budget_max,language,nature_type,name,email,rhythm,hotel_scale,resources_needed,flight,remarks,uuid,order_type)
         values
-            (#{code},#{origin},#{destination},#{startTime},#{endTime},#{peopleNum},GETDATE(),#{peopleAll},#{budgetMin},#{budgetMax},#{language},#{natureType},#{name},#{email},#{rhythm},#{hotelScale},#{resourcesNeeded},#{flight},#{remarks},#{uuid},0)
+            (#{code},#{origin},#{destination},#{startTime},#{endTime},#{peopleNum},format(SYSDATETIME(),'yyyy-MM-dd hh:mm:ss'),#{peopleAll},#{budgetMin},#{budgetMax},#{language},#{natureType},#{name},#{email},#{rhythm},#{hotelScale},#{resourcesNeeded},#{flight},#{remarks},#{uuid},0)
     </insert>
     <!-- 查询私人订制 -->
     <select id="getPrivate" resultType="PrivateOrder">
@@ -24,8 +24,24 @@
                 and code = #{code}
             </if>
     </select>
+    <!-- 查询私人订制 -->
+    <select id="getPrivateAll" resultType="PrivateOrder">
+        SELECT
+            *
+        FROM
+            ( SELECT *, ROW_NUMBER ( ) OVER ( ORDER BY ID ) AS RowId FROM bus_private_ordering ) AS b
+        WHERE
+            RowId BETWEEN #{page} AND #{limit}
+            <if test="uuid != null and uuid != ''">
+                and uuid = #{uuid}
+            </if>
+    </select>
     <!-- 删除私人订制 -->
     <delete id="delPrivate" parameterType="PrivateOrder">
         delete from bus_private_ordering where code = #{code} and uuid = #{uuid}
     </delete>
+    <!-- 新增收藏 -->
+    <insert id="addCollection" parameterType="OrderingConllection">
+        insert into bus_collection(uuid,code,jdrq,ordering_uuid) values(#{uuid},#{code},format(SYSDATETIME(),'yyyy-MM-dd hh:mm:ss'),#{orderingUuid})
+    </insert>
 </mapper>

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

@@ -131,6 +131,9 @@
     </delete>
     <!-- 查看数量 -->
     <update id="updateLookNum" parameterType="Travel">
-        update bus_travel set
+        UPDATE bus_travel
+        SET look_num = ( SELECT look_num + 1 FROM bus_travel WHERE uuid = #{uuid} )
+        WHERE
+            uuid = #{uuid}
     </update>
 </mapper>