Merge remote-tracking branch 'origin/dev' into dev

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

@@ -71,6 +71,9 @@ public class OrderTourVerificationBiz{
         if(baseOrder.getHasPay()==0){
             return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_PAY.getCode(), ResCode.ORDER_IS_NOT_PAY.getDesc());
         }
+        if (baseOrder.getStatus()==6){
+            return ObjectRestResponse.createFailedResult(ResCode.ORDER_HAS_FINISH.getCode(),"二维码不能重复使用");
+        }
        Integer orderId=baseOrder.getId();
         Integer version=baseOrder.getVersion();
         OrderTourDetail tourDetail=new OrderTourDetail();
@@ -94,9 +97,7 @@ public class OrderTourVerificationBiz{
 
         // 出发时间 是否已经发车
         Date departureDate = tourFeign.selectDepartureDataBySpeId(tourDetail.getSpePriceId());
-        //Long departureTime = tourFeign.selectDepartureTimeByStartCompanyIdAndRouteId(tourDetail.getStartCompanyId(), tourDetail.getGoodId());
         Integer departureStatus = tourFeign.selectDepartureStatusByVerificationId(verificationId);
-        //LocalTime localDepartureTime = LocalTime.ofSecondOfDay(departureTime);
         departureDate.setHours(0);
         departureDate.setMinutes(0);
         departureDate.setSeconds(0);
@@ -117,6 +118,7 @@ public class OrderTourVerificationBiz{
         }
 
 
+
         baseOrder=new BaseOrder();
         baseOrder.setId(orderId);
         baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
@@ -128,7 +130,7 @@ public class OrderTourVerificationBiz{
         tourDetail = tourDetailBiz.updateSelectiveByIdReT(tourDetail);
         tourFeign.updateTourGoodPersonNum(verificationId,"verification_person",total_number);
         baseOrderBiz.sendOrderMq(null,tourDetail,null, baseOrder, OrderMQDTO.ORDER_FINISH);
-        return  ObjectRestResponse.succ();
+        return  ObjectRestResponse.succ(tourDetail.getGoodId());
     }
 
     //确定上车

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/ResCode/ResCode.java

@@ -59,7 +59,8 @@ public enum ResCode {
     ORDER_DETAIL_IS_NOT_EXIST(10001, "订单详情不可查询"),
     YOU_AUTH_FAIL(-2,"无权限查看此信息"),
     ORDER_IS_NOT_PAY(10002, "订单未支付"),
-    USER_IS_EXIST(10003, "用户名已存在");
+    USER_IS_EXIST(10003, "用户名已存在"),
+    ORDER_HAS_FINISH(10004,"订单已完成");
     ;
     /**
      * 返回码