修改需求

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

@@ -119,32 +119,42 @@ public class SaticScheduleTask {
                 PrivateOrder privateOrder1 = new PrivateOrder().setUuid(privateOrder.getUuid()).setSupplieName(privateOrder.getSupplieName());
                 privateOrder1.setOrderType(4);
                 privateOrderService.updatePrivateType(privateOrder1);
-                //查询那些行程结束且已到达给供应商付款的时间的定制单
-                List<PrivateOrder> list1 = privateOrderService.updatePrivateFourSomeFarm();
-                for(PrivateOrder privateOrder2 : list1){
-                    PrivateOrder privateOrder3 = new PrivateOrder().setUuid(privateOrder2.getUuid()).setSupplieName(privateOrder2.getSupplieName());
-                    Release release = privateOrderService.getReleaseVal(privateOrder3);//查询报价单编号
-                    Map<String, Object> mapPay = wxPayService.getPay(release.getUuid());//查询付款信息
-                    Map<String, Object> mapRefund = wxPayService.getRefund(release.getUuid());//查询退款信息
-                    Map<String, Object> mapCommis = indexService.getSitesInfo();//查询系统配置
-                    //支付金额 - 退款金额
-                    Double price = Double.parseDouble((String) mapPay.get("totalFee")) - Double.parseDouble((String) mapRefund.get("refundFee"));
-                    Supplier supplier = new Supplier()
-                            .setBalanceOf(price + "")
-                            .setCode(privateOrder.getSupplieName());
-                    //佣金对象
-                    Commission commission = new Commission()
-                            .setReleaseUuid(release.getUuid())
-                            .setUuid(snowflakeUtil.nextId() + "")
-                            .setCommission((price * Double.parseDouble((String) mapCommis.get("percentageBrokerage"))) + "")
-                            .setCode(privateOrder2.getTravelUser());
-                    commissionService.addCommiss(commission);//新增反佣金记录
-                    loginService.updateEntryBlanceOf(commission);//佣金录入个人用户账号
-                    supplierService.setSupplierBalanceOf(supplier); //订单金额存入余额供应商余额
-                }
             }
         }catch (Exception e){
             e.printStackTrace();
         }
     }
+
+    /**
+     * 当前时间小于等于结束时间后的七天的报价单金额存入供应商余额  每天的凌晨一点触发
+     */
+    @Scheduled(cron = "0 01 1 * * ?")
+    public void updatePrivateFourSomeFarm(){
+        //查询那些行程结束且已到达给供应商付款的时间的定制单
+        List<PrivateOrder> list1 = privateOrderService.updatePrivateFourSomeFarm();
+        for(PrivateOrder privateOrder2 : list1){
+            PrivateOrder privateOrder3 = new PrivateOrder().setUuid(privateOrder2.getUuid()).setSupplieName(privateOrder2.getSupplieName());
+            Release release = privateOrderService.getReleaseVal(privateOrder3);//查询报价单编号
+            Map<String, Object> mapPay = wxPayService.getPay(release.getUuid());//查询付款信息
+            Map<String, Object> mapRefund = wxPayService.getRefund(release.getUuid());//查询退款信息
+            Map<String, Object> mapCommis = indexService.getSitesInfo();//查询系统配置
+            //支付金额 - 退款金额
+            Double price = Double.parseDouble((String) mapPay.get("totalFee")) - Double.parseDouble((String) mapRefund.get("refundFee"));
+            Supplier supplier = new Supplier()
+                    .setBalanceOf(price + "")
+                    .setCode(privateOrder2.getSupplieName());
+            //佣金对象
+            Commission commission = new Commission()
+                    .setReleaseUuid(release.getUuid())
+                    .setUuid(snowflakeUtil.nextId() + "")
+                    .setCommission((price * Double.parseDouble((String) mapCommis.get("percentageBrokerage"))) + "")
+                    .setCode(privateOrder2.getTravelUser());
+            commissionService.addCommiss(commission);//新增反佣金记录
+            loginService.updateEntryBlanceOf(commission);//佣金录入个人用户账号
+            supplierService.setSupplierBalanceOf(supplier); //订单金额存入余额供应商余额
+            //供应商余额存入之后 修改订单状态改成已完成
+            privateOrder3.setOrderType(5);
+            privateOrderService.updatePrivateType(privateOrder3);
+        }
+    }
 }

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

@@ -397,8 +397,8 @@ public class PrivateOrderController {
             privateOrderService.reviewRelese(release);
             List<Release> list = privateOrderService.getReleaseHot(release);
             //将所有该定制单的状态改为完成
-            Release release2 = new Release().setOrderType(5).setDemandUuid(release.getDemandUuid()).setCode(list.get(0).getCode());
-            privateOrderService.notInterested(release2);
+//            Release release2 = new Release().setOrderType(5).setDemandUuid(release.getDemandUuid()).setCode(list.get(0).getCode());
+//            privateOrderService.notInterested(release2);
             map.put("msg", "200");
         }catch (Exception e){
             e.printStackTrace();

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

@@ -139,7 +139,7 @@ public class ReleaseTravelController {
             List<Travel> list = releaseTravelService.getTravel(travel);
             Map<String, Object> mapVal = new HashMap<>();
             mapVal.put("list", list);
-            mapVal.put("count", releaseTravelService.getTravelCountAll(travel));
+            mapVal.put("count", releaseTravelService.getTravelCount(travel));
             mapVal.put("page", travel.getPage());
             map.put("data", mapVal);
             map.put("msg", "200");

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

@@ -168,5 +168,14 @@ public class TravelCommentsController {
         return map;
     }
 
-
+    /**
+     * 查询指定用户的互动消息
+     * @param request token 参数
+     * @return 返回结果
+     */
+    @GetMapping("getInteractiveMessage")
+    public Map<String, Object> getInteractiveMessage(HttpServletRequest request){
+        String code = (String)ParsingToken.tokenParsing(request).get("code");
+        return travelCommentsService.getInteractiveMessage(code);
+    }
 }

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

@@ -32,7 +32,7 @@ public interface ReleaseTravelMapper {
 
     int getTravelCountAll(Travel travel);
 
-    int getTravelCount(String code);
+    int getTravelCount(Travel travel);
 
     int getGiveCount(TravelGive travelGive);
 

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

@@ -22,4 +22,6 @@ public interface TravelCommentsMapper {
     Travel getGysUserTravel(String uuid);
 
     int getCommentsUserCount(TravelComments travelComments);
+
+    List<Map<String, Object>> getInteractiveMessage(String code);
 }

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

@@ -28,7 +28,7 @@ public interface ReleaseTravelService {
 
     void updateLookNum(Travel travel);
 
-    int getTravelCount(String code);
+    int getTravelCount(Travel travel);
 
     int getTravelCountAll(Travel travel);
 

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

@@ -20,4 +20,6 @@ public interface TravelCommentsService {
     Travel getGysUserTravel(String demandUuid);
 
     int getCommentsUserCount(TravelComments travelComments);
+
+    Map<String, Object> getInteractiveMessage(String code);
 }

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

@@ -81,8 +81,8 @@ public class ReleaseTravelServiceImpl implements ReleaseTravelService {
     }
 
     @Override
-    public int getTravelCount(String code) {
-        return releaseTravelMapperl.getTravelCount(code);
+    public int getTravelCount(Travel travel) {
+        return releaseTravelMapperl.getTravelCount(travel);
     }
 
     @Override

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

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -53,4 +54,18 @@ public class TravelCommentsServiceImpl implements TravelCommentsService {
     public int getCommentsUserCount(TravelComments travelComments) {
         return travelCommentsMapper.getCommentsUserCount(travelComments);
     }
+
+    @Override
+    public Map<String, Object> getInteractiveMessage(String code) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            map.put("data", travelCommentsMapper.getInteractiveMessage(code));
+            map.put("msg", "200");
+        }catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常，请稍后再试");
+        }
+        return map;
+    }
 }

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

@@ -52,4 +52,19 @@
     <select id="getCommentsUserCount" resultType="int">
         SELECT count(*) from bus_travel_comments where code = #{code}
     </select>
+    <!-- 查询指定用户的互动消息 -->
+    <select id="getInteractiveMessage" resultType="Map" parameterType="String">
+        SELECT
+            a.uuid,
+            a.title_img,
+            b.content,
+            b.jdrq,
+            c.name,
+            c.headpir
+        FROM
+            bus_travel a
+            JOIN ( SELECT travel_uuid, content, jdrq, code FROM bus_travel_comments ) b ON a.uuid = b.travel_uuid
+            LEFT JOIN ( SELECT name, headpir, code FROM sys_users ) c ON b.code = c.code
+        WHERE a.code = #{code}
+    </select>
 </mapper>

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

@@ -131,13 +131,13 @@
                 from bus_travel
                 <trim prefix="WHERE" prefixOverrides="and | or">
                     <if test="destination != null and destination != ''">
-                        destination like CONCAT(CONCAT('%', #{destination}), '%')
+                        and destination like CONCAT(CONCAT('%', #{destination}), '%')
                     </if>
                     <if test="titleTravel != null and titleTravel != ''">
-                        title_travel like CONCAT(CONCAT('%', #{titleTravel}), '%')
+                        and title_travel like CONCAT(CONCAT('%', #{titleTravel}), '%')
                     </if>
                     <if test="jdrq != null and jdrq != ''">
-                        #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
+                        and #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
                     </if>
                 </trim>
                 UNION ALL
@@ -146,13 +146,13 @@
                 from bus_supplier_route
                 <trim prefix="WHERE" prefixOverrides="and | or">
                     <if test="destination != null and destination != ''">
-                        destination like CONCAT(CONCAT('%', #{destination}), '%')
+                        and destination like CONCAT(CONCAT('%', #{destination}), '%')
                     </if>
                     <if test="titleTravel != null and titleTravel != ''">
-                        offer_name like CONCAT(CONCAT('%', #{titleTravel}), '%')
+                        and offer_name like CONCAT(CONCAT('%', #{titleTravel}), '%')
                     </if>
                     <if test="jdrq != null and jdrq != ''">
-                        #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
+                        and #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
                     </if>
                 </trim>
                 ) f ORDER BY f.jdrq desc)
@@ -292,14 +292,11 @@
                     <if test="demandUuid != null and demandUuid != ''">
                         and demand_uuid = #{demandUuid}
                     </if>
-                    <if test="code != null and code != ''">
-                        and code = #{code}
-                    </if>
                     <if test="destination != null and destination != ''">
                         and destination like CONCAT(CONCAT('%', #{destination}), '%')
                     </if>
                     <if test="titleTravel != null and titleTravel != ''">
-                        and  title_travel like CONCAT(CONCAT('%', #{titleTravel}), '%')
+                        and title_travel like CONCAT(CONCAT('%', #{titleTravel}), '%')
                     </if>
                     <if test="jdrq != null and jdrq != ''">
                         and #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
@@ -315,9 +312,6 @@
                     <if test="demandUuid != null and demandUuid != ''">
                         and demand_uuid = #{demandUuid}
                     </if>
-                    <if test="code != null and code != ''">
-                        and code = #{code}
-                    </if>
                     <if test="destination != null and destination != ''">
                         and destination like CONCAT(CONCAT('%', #{destination}), '%')
                     </if>
@@ -338,12 +332,21 @@
             <if test="stateType != null and stateType != ''">
                 and state_type = #{stateType}
             </if>
-            <if test="code != null and code != ''">
-                and code = #{code}
-            </if>
             <if test="demandUuid != null and demandUuid != ''">
                 and demand_uuid = #{demandUuid}
             </if>
+            <if test="destination != null and destination != ''">
+                and destination like CONCAT(CONCAT('%', #{destination}), '%')
+            </if>
+            <if test="titleTravel != null and titleTravel != ''">
+                and title_travel like CONCAT(CONCAT('%', #{titleTravel}), '%')
+            </if>
+            <if test="jdrq != null and jdrq != ''">
+                and #{startTime} <![CDATA[ <= ]]> jdrq and #{endTime} <![CDATA[ > ]]> jdrq
+            </if>
+            <if test="code != null and code != ''">
+                and code = #{code}
+            </if>
         </trim>
     </select>
     <!-- 修改供应商路线查看次数 -->