微信支付

src/main/java/com/travel/config/SaticScheduleTask.java

@@ -73,4 +73,23 @@ public class SaticScheduleTask {
             e.printStackTrace();
         }
     }
+
+    /**
+     * 查询那些付过费的报价单已经行程开始
+     */
+    @Scheduled(cron = "0 01 0 * * ?")
+    public void updatePrivateThree(){
+        try{
+            //查询有多少个超时定制单
+            List<PrivateOrder> list = privateOrderService.updatePrivateThree();
+            //循环修改
+            for(PrivateOrder privateOrder : list){
+                PrivateOrder privateOrder1 = new PrivateOrder().setUuid(privateOrder.getUuid()).setSupplieName(privateOrder.getSupplieName());
+                privateOrder1.setOrderType(3);
+                privateOrderService.updatePrivateType(privateOrder1);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -62,247 +62,10 @@ public class IndexController {
      */
     @GetMapping("getSelectDestination")
     public Map<String, Object> getSelectDestination(IndexHome indexHome){
-        String aaa = "[\n" +
-                "  {\n" +
-                "    \"id\": \"1\",\n" +
-                "    \"title\": \"海南\",\n" +
-                "    \"list\": [\n" +
-                "      {\n" +
-                "        \"id\": \"1-1\",\n" +
-                "        \"title\": \"三亚\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100o1f000001gp6di1DB0_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-2\",\n" +
-                "        \"title\": \"杭州\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100h180000013qm0m8FCA_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-3\",\n" +
-                "        \"title\": \"厦门\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100w1f000001gwb0k4589_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-4\",\n" +
-                "        \"title\": \"舟山\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100j1f000001gpsvo23F2_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-5\",\n" +
-                "        \"title\": \"普陀山\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100u1f000001gq9oy554A_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-6\",\n" +
-                "        \"title\": \"乌镇\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/10081f000001gqideDD5C_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-7\",\n" +
-                "        \"title\": \"三沙\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/0103b120008by6zwv2C1F_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-8\",\n" +
-                "        \"title\": \"西沙群岛\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/01064120009dmxlf4CA22_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-9\",\n" +
-                "        \"title\": \"安吉\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100a1f000001grmbd39CE_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-10\",\n" +
-                "        \"title\": \"海口\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100i1f000001gp5i6F64D_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-11\",\n" +
-                "        \"title\": \"千岛湖\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/10051f000001gsrop80DA_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-12\",\n" +
-                "        \"title\": \"鼓浪屿\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/10080i0000009n4e528E8_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-13\",\n" +
-                "        \"title\": \"宁波\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100511000000rbgpl3A4B_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"1-14\",\n" +
-                "        \"title\": \"文昌\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/10070p000000gd56i053B_C_300_300.jpg\"\n" +
-                "      }\n" +
-                "    ]\n" +
-                "  },\n" +
-                "  {\n" +
-                "    \"id\": \"2\",\n" +
-                "    \"title\": \"云南\",\n" +
-                "    \"list\": [\n" +
-                "      {\n" +
-                "        \"id\": \"2-1\",\n" +
-                "        \"title\": \"丽江\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100b11000000qcd4zEAD7_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"2-2\",\n" +
-                "        \"title\": \"西双版纳\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/fd/tg/g4/M06/9C/D8/CggYHFXRUw2AAJrSABIhk3trj7Y885_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"2-3\",\n" +
-                "        \"title\": \"大理\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100n0w000000k4n3fB3A0_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"2-4\",\n" +
-                "        \"title\": \"贵阳\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/fd/tg/g1/M05/7E/7C/CghzfVWw7oSAeySKAA5ZvOEffxM022_C_300_300.jpg\"\n" +
-                "      }\n" +
-                "    ]\n" +
-                "  },\n" +
-                "  {\n" +
-                "    \"id\": \"3\",\n" +
-                "    \"title\": \"大西北\",\n" +
-                "    \"list\": [\n" +
-                "      {\n" +
-                "        \"id\": \"3-1\",\n" +
-                "        \"title\": \"西安\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100h1f000001grwhl72DF_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"3-2\",\n" +
-                "        \"title\": \"呼伦贝尔\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100e1f000001gt0hhB289_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"3-3\",\n" +
-                "        \"title\": \"乌鲁木齐\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/fd/tg/g1/M04/81/1E/CghzfVWxFZiABg-8AAzcRbgsQNc600_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"3-4\",\n" +
-                "        \"title\": \"敦煌\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/fd/tg/g1/M02/CD/5B/CghzflWxBpmANqI5ADKlj7KU73c490_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"3-5\",\n" +
-                "        \"title\": \"青海湖\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100l0g000000876eiE312_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"3-6\",\n" +
-                "        \"title\": \"乌兰布统\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100s0a0000004dnspF99A_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"3-7\",\n" +
-                "        \"title\": \"甘南\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/10041f000001gp8dyA105_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"3-8\",\n" +
-                "        \"title\": \"阿勒泰\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/fd/tg/g1/M02/7C/DD/CghzfFWwytmAPh5CAA7xsh3u1eI467_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"3-9\",\n" +
-                "        \"title\": \"喀纳斯\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/fd/tg/g2/M04/88/EB/CghzgVWwwW-ACudcAB0CQx96bm4190_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"3-10\",\n" +
-                "        \"title\": \"嘉峪关\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100a1f000001grlc5A8E3_C_300_300.jpg\"\n" +
-                "      }\n" +
-                "    ]\n" +
-                "  },\n" +
-                "  {\n" +
-                "    \"id\": \"4\",\n" +
-                "    \"title\": \"广东\",\n" +
-                "    \"list\": [\n" +
-                "      {\n" +
-                "        \"id\": \"4-1\",\n" +
-                "        \"title\": \"桂林\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100f1f000001gqajd878F_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"4-2\",\n" +
-                "        \"title\": \"广州\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100c180000014rkpq4C68_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"4-3\",\n" +
-                "        \"title\": \"广州长隆度假区\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/10080y000000m1s71AAA5_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"4-4\",\n" +
-                "        \"title\": \"深圳\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/10051f000001gsu9xBA0E_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"4-5\",\n" +
-                "        \"title\": \"珠海\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/fd/tg/g1/M05/74/3D/CghzflUsoXCAEV4aAAm86zXLkaY672_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"4-6\",\n" +
-                "        \"title\": \"南宁\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/10020t000000iwjol8F2F_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"4-7\",\n" +
-                "        \"title\": \"珠江长隆旅游度假区\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100mhk1439u4tvsn647A2_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"4-8\",\n" +
-                "        \"title\": \"南澳\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/0106t120008tlqdr7D429_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"4-9\",\n" +
-                "        \"title\": \"惠州\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/fd/tg/g3/M09/4A/C6/CggYGVaUpY2AZk-yACGJ8DHMMOs490_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"4-10\",\n" +
-                "        \"title\": \"潮汕地区\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100n160000010omgrB847_C_300_300.jpg\"\n" +
-                "      }\n" +
-                "    ]\n" +
-                "  },\n" +
-                "  {\n" +
-                "    \"id\": \"5\",\n" +
-                "    \"title\": \"四川\",\n" +
-                "    \"list\": [\n" +
-                "      {\n" +
-                "        \"id\": \"5-1\",\n" +
-                "        \"title\": \"成都\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100r1f000001gon9mBC5D_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"5-2\",\n" +
-                "        \"title\": \"重庆\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/100w10000000q9cpfC75C_C_300_300.jpg\"\n" +
-                "      },\n" +
-                "      {\n" +
-                "        \"id\": \"5-3\",\n" +
-                "        \"title\": \"九寨沟\",\n" +
-                "        \"img\": \"https://youimg1.c-ctrip.com/target/fd/tg/g2/M02/88/E8/Cghzf1WwvRuAe2puAA0StCMWUV0813_C_300_300.jpg\"\n" +
-                "      }\n" +
-                "    ]\n" +
-                "  }\n" +
-                "]\n";
         Map<String, Object> map = new HashMap<>();
         try{
             // 字符串转List
-            List<Map> list = JSONArray.parseArray(aaa, Map.class);
+            List<Map<String, Object>> list = indexService.getSelectDestination(indexHome);
             map.put("data", list);
             map.put("msg", "200");
         }catch (Exception e){

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

@@ -12,6 +12,7 @@ import com.travel.model.ConfirmOrdering;
 import com.travel.model.Supplier;
 import com.travel.service.SupplierService;
 import com.travel.util.ParsingToken;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -218,12 +219,10 @@ public class SupplierController {
             confirmOrdering.setCode((String) userMap.get("code"));
             List<ConfirmOrdering> list = new ArrayList<>();
             String[] codeArray = confirmOrdering.getSupplierCode().split(",");
-            System.out.println(confirmOrdering.getSupplierCode());
             for(int i = 0; i < codeArray.length; i++){
-                System.out.println(codeArray[i]);
                 confirmOrdering.setSupplierCode(codeArray[i]);
                 ConfirmOrdering confirmOrdering1 = supplierService.getSupplierDestination(confirmOrdering);
-                if(confirmOrdering1.getDestination() != null){
+                if(null != confirmOrdering1){
                     confirmOrdering1.setSupplierCode(codeArray[i]);
                 }
                 list.add(confirmOrdering1);

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

@@ -14,4 +14,6 @@ public interface IndexMapper {
     List<IndexHome> getIndexHomeUrl(IndexHome indexHome);
 
     List<Map<String, Object>> getDestination(IndexHome indexHome);
+
+    List<Map<String, Object>> getSelectDestination(IndexHome indexHome);
 }

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

@@ -67,4 +67,6 @@ public interface PrivateOrderMapper {
     int userCollectionTravelCount(OrderingConllection orderingConllection);
 
     void reviewRelese(Release release);
+
+    List<PrivateOrder> updatePrivateThree();
 }

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

@@ -181,5 +181,13 @@ public class Travel implements Serializable {
      * 报价单编号
      */
     private String releaseUuid;
+    /**
+     * 开始时间
+     */
+    private String startTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
 
 }

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

@@ -13,4 +13,6 @@ public interface IndexService {
     List<IndexHome> getIndexHomeUrl(IndexHome indexHome);
 
     List<Map<String, Object>> getDestination(IndexHome indexHome);
+
+    List<Map<String, Object>> getSelectDestination(IndexHome indexHome);
 }

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

@@ -65,4 +65,6 @@ public interface PrivateOrderService {
     int userCollectionTravelCount(OrderingConllection orderingConllection);
 
     void reviewRelese(Release release);
+
+    List<PrivateOrder> updatePrivateThree();
 }

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

@@ -29,4 +29,9 @@ public class IndexServiceImpl implements IndexService {
     public List<Map<String, Object>> getDestination(IndexHome indexHome) {
         return indexMapper.getDestination(indexHome);
     }
+
+    @Override
+    public List<Map<String, Object>> getSelectDestination(IndexHome indexHome) {
+        return indexMapper.getSelectDestination(indexHome);
+    }
 }

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

@@ -178,4 +178,9 @@ public class PrivateOrderServiceImpl implements PrivateOrderService {
     public void reviewRelese(Release release) {
         privateOrderMapper.reviewRelese(release);
     }
+
+    @Override
+    public List<PrivateOrder> updatePrivateThree() {
+        return privateOrderMapper.updatePrivateThree();
+    }
 }

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

@@ -42,4 +42,23 @@
     <select id="getDestination" resultType="Map" parameterType="IndexHome">
         select * from tuya_article_info where category_id = #{type} order by sort_id
     </select>
+    <!-- 查询选择目的地 -->
+    <select id="getSelectDestination" resultType="Map">
+        SELECT
+            c.channel_id,
+            c.channel_name,
+            b.category_id,
+            b.category_name,
+            b.category_title,
+            a.article_id,
+            a.article_title,
+            a.article_img_url1
+        FROM
+            tuya_article_info a
+                INNER JOIN tuya_category_info b ON a.category_id = b.category_id
+                INNER JOIN tuya_channel_info c ON b.channel_id = c.channel_id
+        WHERE
+            c.channel_id = 6
+        ORDER BY b.category_id
+    </select>
 </mapper>

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

@@ -118,13 +118,29 @@
             JOIN ( SELECT demand_uuid FROM bus_private_ordering_type WHERE order_type = '0' AND order_type != '9') b ON a.uuid = b.demand_uuid
         WHERE a.start_time <![CDATA[ < ]]> SYSDATETIME()
     </select>
+    <!-- 查询那些定制单已经行程开始 -->
+    <select id="updatePrivateThree" parameterType="PrivateOrder" resultType="PrivateOrder">
+        SELECT
+            a.*
+        FROM
+            bus_private_ordering a
+            JOIN ( SELECT demand_uuid FROM bus_private_ordering_type WHERE order_type = '2') b ON a.uuid = b.demand_uuid
+        WHERE a.start_time <![CDATA[ = ]]> SYSDATETIME()
+    </select>
     <!-- 查询定制单状态里是否存在这一项 -->
     <select id="getPrivateType" parameterType="PrivateOrder" resultType="int">
         select COUNT( * ) AS COUNT from bus_private_ordering_type where demand_uuid = #{uuid}
     </select>
     <!-- 超时修改状态 -->
     <update id="updatePrivateType" parameterType="PrivateOrder">
-        update bus_private_ordering_type set order_type = #{orderType} where demand_uuid = #{uuid}
+        update
+            bus_private_ordering_type
+        set order_type = #{orderType}
+        where
+              demand_uuid = #{uuid}
+            <if test="code != null and code != ''">
+                and code = #{supplieName}
+            </if>
     </update>
     <!-- 查询指定定制单的报价单 -->
     <select id="getPrivateRelase" parameterType="PrivateOrder" resultType="Map">

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

@@ -73,7 +73,13 @@
                     LEFT JOIN ( SELECT headpir, name, code FROM sys_users ) f ON f.code = a.code
                 <trim prefix="WHERE" prefixOverrides="and | or">
                     <if test="destination != null and destination != ''">
-                        a.destination = #{destination}
+                        a.destination like CONCAT(CONCAT('%', #{destination}), '%')
+                    </if>
+                    <if test="titleTravel != null and titleTravel != ''">
+                        a.title_travel like CONCAT(CONCAT('%', #{titleTravel}), '%')
+                    </if>
+                    <if test="jdrq != null and jdrq != ''">
+                        #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
                     </if>
                 </trim>
                 UNION ALL
@@ -107,7 +113,13 @@
                     LEFT JOIN ( SELECT headpir, name, code FROM sys_supplier ) f ON f.code = a.code
                 <trim prefix="WHERE" prefixOverrides="and | or">
                     <if test="destination != null and destination != ''">
-                        a.destination = #{destination}
+                        a.destination like CONCAT(CONCAT('%', #{destination}), '%')
+                    </if>
+                    <if test="titleTravel != null and titleTravel != ''">
+                        a.offer_name like CONCAT(CONCAT('%', #{titleTravel}), '%')
+                    </if>
+                    <if test="jdrq != null and jdrq != ''">
+                        #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
                     </if>
                 </trim>
             ) e
@@ -119,7 +131,13 @@
                 from bus_travel
                 <trim prefix="WHERE" prefixOverrides="and | or">
                     <if test="destination != null and destination != ''">
-                        destination = #{destination}
+                        a.destination like CONCAT(CONCAT('%', #{destination}), '%')
+                    </if>
+                    <if test="titleTravel != null and titleTravel != ''">
+                        a.title_travel like CONCAT(CONCAT('%', #{titleTravel}), '%')
+                    </if>
+                    <if test="jdrq != null and jdrq != ''">
+                        #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
                     </if>
                 </trim>
                 UNION ALL
@@ -128,7 +146,13 @@
                 from bus_supplier_route
                 <trim prefix="WHERE" prefixOverrides="and | or">
                     <if test="destination != null and destination != ''">
-                        destination = #{destination}
+                        a.destination like CONCAT(CONCAT('%', #{destination}), '%')
+                    </if>
+                    <if test="titleTravel != null and titleTravel != ''">
+                        a.offer_name like CONCAT(CONCAT('%', #{titleTravel}), '%')
+                    </if>
+                    <if test="jdrq != null and jdrq != ''">
+                        #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
                     </if>
                 </trim>
                 ) f ORDER BY f.jdrq desc)