Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTourVerificationBiz.java

@@ -8,6 +8,7 @@ import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.mapper.OrderTourVerificationMapper;
 import com.xxfc.platform.order.pojo.order.OrderTourVerificationVO;
 import com.xxfc.platform.tour.feign.TourFeign;
+import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -59,13 +60,13 @@ public class OrderTourVerificationBiz{
     //确定上车
     public ObjectRestResponse finishByOrder(Integer verificationId){
 
-        return  ObjectRestResponse.succ();
+        return  ObjectRestResponse.succ(tourFeign.updateTourGoodVerificationStatus(verificationId));
     }
 
-    //确定上车
-    public ObjectRestResponse finishByOrders(Integer verificationId){
+    //核销列表
+    public ObjectRestResponse getVerifications(TourGoodOrderFindVo tourGoodOrderFindVo){
 
-        return  ObjectRestResponse.succ();
+        return  ObjectRestResponse.succ(tourFeign.findTourGoodOrders(tourGoodOrderFindVo));
     }
 
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderTourVerificationController.java

@@ -18,6 +18,7 @@ import com.xxfc.platform.order.pojo.order.TourBO;
 import com.xxfc.platform.order.pojo.price.TourPriceVO;
 import com.xxfc.platform.order.service.OrderTourService;
 import com.xxfc.platform.tour.feign.TourFeign;
+import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -35,9 +36,6 @@ public class OrderTourVerificationController extends CommonBaseController {
     @Autowired
     OrderTourVerificationBiz verificationBiz;
 
-    @Autowired
-    TourFeign tourFeign;
-
     @Autowired
     protected UserAuthConfig userAuthConfig;
 
@@ -75,12 +73,8 @@ public class OrderTourVerificationController extends CommonBaseController {
 
     @RequestMapping(value = "/verification/list",method = RequestMethod.GET)
     @ApiOperation(value = "旅游核销订单列表")
-    public ObjectRestResponse list(
-            @RequestParam(value = "page",defaultValue = "1") Integer page,
-            @RequestParam(value = "limit",defaultValue = "10") Integer limit,
-            @RequestParam(value = "verificationId",defaultValue = "0") Integer verificationId
-    ){
-        return ObjectRestResponse.succ(verificationBiz.getVerificationList(page,limit,verificationId));
+    public ObjectRestResponse list(TourGoodOrderFindVo tourGoodOrderFindVo){
+        return verificationBiz.getVerifications(tourGoodOrderFindVo);
     }