旅游核销

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

@@ -80,11 +80,11 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
      * @param goodId
      * @param speId
      * @param siteId
-     * @param fileName
+     * @param properties
      * @return
      */
-    public int updateTourGoodPersonNum(Integer goodId,Integer speId,Integer siteId ,String fileName){
+    public int updateTourGoodPersonNum(Integer goodId,Integer speId,Integer siteId ,String properties){
 
-         return mapper.updateTourGoodPerNumbs(goodId,speId,siteId,fileName);
+         return mapper.updateTourGoodPerNumbs(goodId,speId,siteId,properties);
     }
 }
\ No newline at end of file

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

@@ -35,11 +35,11 @@ public interface TourGoodVerificationMapper extends Mapper<TourGoodVerification>
      * @param goodId
      * @param speId
      * @param siteId
-     * @param fileName
+     * @param properties
      * @return
      */
-    @Update("update tour_good_verification set ${fileName}=${fileName}+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 fileName);
+    @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);
 
     /**
      * 更新出发状态

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

 package com.xxfc.platform.tour.rest;
 
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.tour.biz.TourGoodVerificationBiz;
 import com.xxfc.platform.tour.entity.TourGoodVerification;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
+import com.xxfc.platform.tour.vo.TourGoodOrderVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("tour")
+@RequestMapping("/tourGood/verfication")
 @IgnoreClientToken
 public class TourGoodVerificationController extends BaseController<TourGoodVerificationBiz, TourGoodVerification> {
+    /**
+     * 查询订单列表
+     * @param tourGoodOrderFindVo
+     * @return
+     */
+    @ApiOperation("订单列表的查询")
+    @GetMapping("/orders")
+    public ObjectRestResponse<PageDataVO<TourGoodOrderVo>> findTourGoodOrders(TourGoodOrderFindVo tourGoodOrderFindVo){
+        PageDataVO<TourGoodOrderVo> tourGoodOrderPageDataVo = getBaseBiz().findTourGoodOrdersPage(tourGoodOrderFindVo);
+        return ObjectRestResponse.succ(tourGoodOrderPageDataVo);
+    }
 
 
+    /**
+     * 更新发车状态
+     * @param goodId
+     * @param speId
+     * @param siteId
+     * @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);
+        if (effectRows>0){
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
 
 
-
-
-
-
-
-
+    /**
+     * 更新总人数或上车人数
+     * @param goodId
+     * @param speId
+     * @param siteId
+     * @param fileName
+     * @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){
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
 }
\ No newline at end of file