修改需求

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

@@ -414,4 +414,24 @@ public class PrivateOrderController {
         }
         return map;
     }
+
+    /**
+     * 用户自定义游玩信息
+     * @param supplierReleaseDay 参数
+     * @return 返回结果
+     */
+    @PostMapping("addReleaseRemind")
+    public Map<String, Object> addReleaseRemind(@RequestBody SupplierReleaseDay supplierReleaseDay){
+        return privateOrderService.addReleaseRemind(supplierReleaseDay);
+    }
+
+    /**
+     * 查询用户自定义游玩信息
+     * @param uuid 参数
+     * @return 返回结果
+     */
+    @GetMapping("getReleaseRemind")
+    public Map<String, Object> getReleaseRemind(String uuid){
+        return privateOrderService.getReleaseRemind(uuid);
+    }
 }

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

@@ -209,7 +209,7 @@ public class ReleaseTravelController {
      * @return 返回结果
      */
     @DeleteMapping("delTravel")
-    public Map<String ,Object> delTravel(Travel travel, HttpServletRequest request){
+    public Map<String ,Object> delTravel(@RequestBody Travel travel, HttpServletRequest request){
         Map<String, Object> map = new HashMap<>();
         try{
             Map<String, Object> userMap = ParsingToken.tokenParsing(request);
@@ -217,7 +217,6 @@ public class ReleaseTravelController {
             releaseTravelService.delTravel(travel);
             map.put("msg", "200");
         }catch (Exception e){
-
             e.printStackTrace();
             map.put("msg", "500");
             map.put("errMsg", "服务器请求异常，请稍后再试");

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

@@ -1,15 +1,20 @@
 package com.travel.controller;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alipay.api.AlipayClient;
-import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.request.AlipayTradePagePayRequest;
+import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
 import com.travel.zfb.ZfbPayUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.alibaba.fastjson.JSONObject;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.domain.AlipayTradePrecreateModel;
+import com.alipay.api.domain.AlipayTradeQueryModel;
+import com.alipay.api.request.AlipayTradePrecreateRequest;
+import com.alipay.api.request.AlipayTradeQueryRequest;
+import com.alipay.api.response.AlipayTradePrecreateResponse;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -34,34 +39,35 @@ public class ZfbPayController extends ZfbPayUtils {
     public Map<String, Object> toPay(String price) throws Exception {
         Map<String, Object> map = new HashMap<>();
         //获得初始化的AlipayClient
+        System.out.println(APPID);
+        System.out.println(GATEWAYURL);
+        System.out.println(MERCHANTPRIVATEKEY);
+        System.out.println(CHARSET);
+        System.out.println(ALIPAYPUBLICKEY);
+        System.out.println(SIGNTYPE);
         AlipayClient alipayClient = new DefaultAlipayClient(GATEWAYURL, APPID, MERCHANTPRIVATEKEY, "json", CHARSET, ALIPAYPUBLICKEY, SIGNTYPE);
 
         //设置请求参数
-        AlipayTradePagePayRequest alipayRequest = new AlipayTradePagePayRequest();
-        alipayRequest.setNotifyUrl(NOTIFYURL);
-        try {
-            String out_trade_no = getOrderNo();//订单号
-            Map<String,Object> para = new HashMap<>();
-            para.put("out_trade_no", out_trade_no);
-            para.put("subject", "途丫-" + out_trade_no);//订单标题
-            para.put("total_amount", price);//订单金额 单位元
-            para.put("timeout_express", "30m");
-            //发送请求参数 orderid 订单id，price表示价格，title表示订单标题
-//            alipayRequest.setBizContent("{\"out_trade_no\":\"" + out_trade_no + "\","
-//                    + "\"total_amount\":\"" + price + "\","
-//                    + "\"subject\":\"途丫-" + out_trade_no+ "\","
-//                    + "\"product_code\":\"FAST_INSTANT_TRADE_PAY\"}");
-            alipayRequest.setBizContent(JSON.toJSONString(para));
-            //请求
-            String result;
-            result = alipayClient.pageExecute(alipayRequest).getBody();
+        AlipayTradePrecreateRequest request = new AlipayTradePrecreateRequest();
+        String out_trade_no = getOrderNo();//订单号
+        Map<String,Object> para = new HashMap<>();
+        para.put("out_trade_no", out_trade_no);
+        para.put("subject", "途丫-" + out_trade_no);//订单标题
+        para.put("total_amount", price);//订单金额 单位元
+        para.put("timeout_express", "15m");
+
+        request.setBizContent(JSON.toJSONString(para));
+        request.setNotifyUrl(NOTIFYURL);
+        //调用接口
+        AlipayTradePrecreateResponse response = alipayClient.execute(request);
+        System.out.println(JSONObject.toJSONString(response));
+        if(response.isSuccess()){
             map.put("msg", "200");
-            map.put("data", result);
-        } catch (Exception e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            map.put("data", response);
+        } else {
+            System.out.println(1);
             map.put("msg", "500");
-            map.put("data", "服务器请求异常，请稍后再试");
+            map.put("errMsg", "调用失败");
         }
         return map;
     }

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

@@ -77,4 +77,8 @@ public interface PrivateOrderMapper {
     List<PrivateOrder> updatePrivateFourSomeFarm();
 
     void satisfiedRelease(SupplierReleasePlay supplierReleasePlay);
+
+    void addReleaseRemind(SupplierReleaseDay supplierReleaseDay);
+
+    List<SupplierReleaseDay> getReleaseRemind(String uuid);
 }

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

@@ -75,4 +75,8 @@ public interface PrivateOrderService {
     List<PrivateOrder> updatePrivateFourSomeFarm();
 
     Map<String, Object> satisfiedRelease(SupplierReleasePlay supplierReleasePlay);
+
+    Map<String, Object> addReleaseRemind(SupplierReleaseDay supplierReleaseDay);
+
+    Map<String, Object> getReleaseRemind(String uuid);
 }

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

@@ -214,4 +214,32 @@ public class PrivateOrderServiceImpl implements PrivateOrderService {
         }
         return map;
     }
+
+    @Override
+    public Map<String, Object> addReleaseRemind(SupplierReleaseDay supplierReleaseDay) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            privateOrderMapper.addReleaseRemind(supplierReleaseDay);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
+
+    @Override
+    public Map<String, Object> getReleaseRemind(String uuid) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            map.put("msg", "200");
+            map.put("data", privateOrderMapper.getReleaseRemind(uuid));
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
 }

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

@@ -36,7 +36,7 @@
         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
+            JOIN bus_private_ordering_type a on order_type = #{orderType} a nd b.uuid = a.demand_uuid
         WHERE
             b.id not in
             (
@@ -211,6 +211,9 @@
             <if test="uuid != null and uuid != ''">
                 and a.uuid = #{uuid}
             </if>
+            <if test="uuid == null or uuid == ''">
+                and a.hot_form = '0'
+            </if>
         </trim>
         order by a.id desc
     </select>
@@ -412,4 +415,13 @@
         where
             id = #{id} and uuid = #{uuid}
     </update>
+    <!-- 用户自定义游玩信息 -->
+    <insert id="addReleaseRemind" parameterType="SupplierReleaseDay">
+        insert into bus_release_remind(uuid,plan_date,content,date_time,day_num)
+        values(#{uuid},#{planDate},#{content},#{dateTime},#{dayNum})
+    </insert>
+    <!-- 查询用户自定义游玩信息 -->
+    <select id="getReleaseRemind" resultType="SupplierReleaseDay" parameterType="String">
+        select * from bus_release_remind where uuid = #{uuid}
+    </select>
 </mapper>

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

@@ -34,6 +34,7 @@
             <if test="demandUuid != null and demandUuid != ''">
                 and a.demand_uuid = #{demandUuid}
             </if>
+            and a.state_type = '1'
             and a.id not in (select top ${page} id  from bus_travel where code = #{code}) order by a.id
         </trim>
     </select>
@@ -55,6 +56,7 @@
                     a.title_travel,
                     a.travel_date,
                     a.title_day_name,
+                    a.destination,
                     a.amount,
                     a.people_all,
                     a.travel_day,
@@ -81,6 +83,7 @@
                     <if test="jdrq != null and jdrq != ''">
                         and #{startTime} <![CDATA[ <= ]]> a.jdrq and #{endTime} <![CDATA[ > ]]> jdrq
                     </if>
+                    and state_type = '1'
                 </trim>
                 UNION ALL
                 SELECT
@@ -95,6 +98,7 @@
                     a.offer_name as titleTravel,
                     (a.start_time + '~' + a.end_time) as travelDate,
                     a.title_day_name,
+                    a.destination,
                     a.price_all,
                     a.people_num,
                     datediff(day,a.start_time,a.end_time) as travelDay,
@@ -197,7 +201,7 @@
     </select>
     <!-- 删除游记 -->
     <delete id="delTravel" parameterType="Travel">
-        delete from bus_travel where uuid = #{uuid} and code = #{code}
+        update bus_travel set state_type = '0' where uuid = #{uuid} and code = #{code}
     </delete>
     <!-- 删除每日游记 -->
     <delete id="delTravelExper">
@@ -301,6 +305,7 @@
                     <if test="jdrq != null and jdrq != ''">
                         and #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
                     </if>
+                     and state_type = '1'
                 </trim>
                 UNION ALL
                 select id
@@ -329,9 +334,7 @@
         select count(*) as count
         from bus_travel
         <trim prefix="WHERE" prefixOverrides="and | or">
-            <if test="stateType != null and stateType != ''">
-                and state_type = #{stateType}
-            </if>
+            and state_type = '1'
             <if test="demandUuid != null and demandUuid != ''">
                 and demand_uuid = #{demandUuid}
             </if>
@@ -444,6 +447,7 @@
             bus_supplier_route a
             LEFT JOIN sys_supplier b ON a.code = b.code
             LEFT JOIN (SELECT count(*) AS routeNum,code FROM bus_supplier_route GROUP BY code) c ON a.code = c.code
+        WHERE hot_form = '0'
     </select>
     <!-- 查询指定报价单的状态是否是2跟3 -->
     <select id="getReleseType" resultType="Map">