旅游核销

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java

@@ -2,10 +2,13 @@ package com.xxfc.platform.tour.feign;
 
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.dto.TourSpePriceDTO;
 import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.tour.entity.TourGoodVerification;
 import com.xxfc.platform.tour.entity.TourUser;
+import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
+import com.xxfc.platform.tour.vo.TourGoodOrderVo;
 import com.xxfc.platform.tour.vo.TourSpePriceVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
@@ -46,26 +49,26 @@ public interface TourFeign {
 
     /**
      * 更新发车状态
-     * @param goodId
-     * @param speId
-     * @param siteId
+     * @param verficationId
      * @return
      */
     @PutMapping("/tourGood/verfication/status")
-    ObjectRestResponse<Void> updateTourGoodVerificationStatus(@RequestParam("goodId") Integer goodId,
-                                                                     @RequestParam("speId") Integer speId,
-                                                                     @RequestParam("siteId") Integer siteId);
+    ObjectRestResponse<Void> updateTourGoodVerificationStatus(@RequestParam("verficationId") Integer verficationId);
 
     /**
      * 更新总人数或上车人数
-     * @param goodId
-     * @param speId
-     * @param siteId
+     * @param verficationId
      * @param properties
      * @return
      */
      @PutMapping("/tourGood/verfication/personnums")
-     ObjectRestResponse<Void> updateTourGoodPersonNum(@RequestParam("goodId") Integer goodId,
-                                                            @RequestParam("speId") Integer speId,
-                                                            @RequestParam("properties") Integer siteId ,String properties);
+     ObjectRestResponse<Void> updateTourGoodPersonNum(@RequestParam("verficationId") Integer verficationId,String properties);
+
+    /**
+     * 查询订单列表
+     * @param tourGoodOrderFindVo
+     * @return
+     */
+    @GetMapping("/orders")
+    public ObjectRestResponse<PageDataVO<TourGoodOrderVo>> findTourGoodOrders(TourGoodOrderFindVo tourGoodOrderFindVo);
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodVerificationBiz.java

@@ -66,25 +66,21 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
 
     /**
      * 更改发车状态
-     * @param goodId
-     * @param speId
-     * @param siteId
+      * @param verficationId
      * @return
      */
-    public int updateTourGoodVerificationStatus(Integer goodId,Integer speId,Integer siteId){
-        return mapper.updateStatusByGoodIdAndSpeIdAndSiteId(goodId,speId,siteId,0);
+    public int updateTourGoodVerificationStatus(Integer verficationId){
+        return mapper.updateStatusByGoodIdAndSpeIdAndSiteId(verficationId,0);
     }
 
     /**
      * 更新总人数 或 上车人数
-     * @param goodId
-     * @param speId
-     * @param siteId
+      * @param verficationId
      * @param properties
      * @return
      */
-    public int updateTourGoodPersonNum(Integer goodId,Integer speId,Integer siteId ,String properties){
+    public int updateTourGoodPersonNum(Integer verficationId,String properties){
 
-         return mapper.updateTourGoodPerNumbs(goodId,speId,siteId,properties);
+         return mapper.updateTourGoodPerNumbs(verficationId,properties);
     }
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodVerificationMapper.java

@@ -32,22 +32,18 @@ public interface TourGoodVerificationMapper extends Mapper<TourGoodVerification>
 
     /**
      * 更新总人数 或 上车人数
-     * @param goodId
-     * @param speId
-     * @param siteId
      * @param properties
      * @return
      */
-    @Update("update tour_good_verification set ${properties}=${properties}+1 where `good_id`=#{goodId} and `spe_id`=#{speId} and `site_id`=#{siteId}")
-    int updateTourGoodPerNumbs(@Param("goodId") Integer goodId, @Param("speId") Integer speId, @Param("siteId") Integer siteId,@Param("fileName") String properties);
+    @Update("update tour_good_verification set ${properties}=${properties}+1 where `id`=#{verficationId}")
+    int updateTourGoodPerNumbs(@Param("verficationId") Integer verficationId,@Param("properties") String properties);
 
     /**
      * 更新出发状态
-     * @param goodId
-     * @param speId
-     * @param siteId
+     * @param status
+     * @param verficationId
      * @return
      */
-    @Update("update tour_good_verification set `status`=#{status} where where `good_id`=#{goodId} and `spe_id`=#{speId} and `site_id`=#{siteId}")
-    int updateStatusByGoodIdAndSpeIdAndSiteId(@Param("goodId") Integer goodId, @Param("speId") Integer speId, @Param("siteId") Integer siteId,@Param("status") Integer status);
+    @Update("update tour_good_verification set `status`=#{status} where where `id`=#{verficationId}")
+    int updateStatusByGoodIdAndSpeIdAndSiteId(@Param("verficationId") Integer verficationId,@Param("status") Integer status);
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java

@@ -30,17 +30,13 @@ public class TourGoodVerificationController extends BaseController<TourGoodVerif
 
     /**
      * 更新发车状态
-     * @param goodId
-     * @param speId
-     * @param siteId
+     * @param verficationId
      * @return
      */
     @PutMapping("/status")
     @ApiOperation("更新发车状态")
-    public ObjectRestResponse<Void> updateTourGoodVerificationStatus(@RequestParam("goodId") Integer goodId,
-                                                                     @RequestParam("speId") Integer speId,
-                                                                     @RequestParam("siteId") Integer siteId){
-        int effectRows = getBaseBiz().updateTourGoodVerificationStatus(goodId, speId, siteId);
+    public ObjectRestResponse<Void> updateTourGoodVerificationStatus(@RequestParam("verficationId") Integer verficationId){
+        int effectRows = getBaseBiz().updateTourGoodVerificationStatus(verficationId);
         if (effectRows>0){
             return ObjectRestResponse.succ();
         }
@@ -50,19 +46,15 @@ public class TourGoodVerificationController extends BaseController<TourGoodVerif
 
     /**
      * 更新总人数或上车人数
-     * @param goodId
-     * @param speId
-     * @param siteId
+     * @param verficationId
      * @param properties
      * @return
      */
     @PutMapping("/personnums")
     @ApiOperation("更新总人数或上车人数")
-    public ObjectRestResponse<Void> updateTourGoodPersonNum(@RequestParam("goodId") Integer goodId,
-                                                            @RequestParam("speId") Integer speId,
-                                                            @RequestParam("properties") Integer siteId ,String properties){
-        int effectRows = getBaseBiz().updateTourGoodPersonNum(goodId, speId, siteId, properties);
-        if (effectRows>0){
+    public ObjectRestResponse<Void> updateTourGoodPersonNum(@RequestParam("verficationId") Integer verficationId,String properties){
+        int effectRows = getBaseBiz().updateTourGoodPersonNum(verficationId,properties);
+            if (effectRows>0){
             return ObjectRestResponse.succ();
         }
         return ObjectRestResponse.createDefaultFail();