修改订单

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/OrderTourDetail.java

@@ -115,4 +115,21 @@ public class OrderTourDetail implements Serializable {
 	@ApiModelProperty(value = "联系邮箱")
     private String contactEmail;
 
+	//总人数
+	@Column(name = "total_number")
+	@ApiModelProperty(value = "总人数")
+	private Integer totalNumber;
+
+	//出发城市编号
+	@Column(name = "start_city")
+	@ApiModelProperty(value = "出发城市编号")
+	private Integer startCity;
+
+	//出发城市名称
+	@Column(name = "start_city_name")
+	@ApiModelProperty(value = "出发城市名称")
+	private String startCityName;
+
+
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java

@@ -29,8 +29,10 @@ import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.tour.entity.TourUser;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.tour.vo.TourSpePriceVo;
+import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import lombok.extern.log4j.Log4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -50,6 +52,9 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
     @Autowired
     TourFeign tourFeign;
 
+    @Autowired
+    VehicleFeign vehicleFeign;
+
 
     private static Integer IS_CHILD = 0;
 
@@ -100,6 +105,15 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
         //设置订单名称
         bo.getOrder().setName(bo.getTourGood().getName());
 
+        //设置城市
+        CompanyDetail companyDetail = vehicleFeign.getCompanyDetail(bo.getStartCompanyId()).getData();
+        SysRegion sysRegion = companyDetail.getSysRegions().get(1);
+        bo.setStartCity(sysRegion.getId().intValue());
+        bo.setStartCityName(sysRegion.getName());
+
+        //扣減庫存
+        tourFeign.stock(bo.getSpePriceId(), bo.getTotalNumber());
+
         super.handleDetail(bo);
     }
 
@@ -132,6 +146,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
 
         detail.setNumber(childs.size());
         detail.setChildNumber(notChilds.size());
+        detail.setTotalNumber(users.size());
 
         //计算旅游价格
         ObjectRestResponse<TourSpePriceVo> objectRestResponse = tourFeign.refund(new TourSpePriceDTO(){{

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -4,6 +4,8 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -21,4 +23,7 @@ public interface VehicleFeign {
 
     @RequestMapping(value = "/rent/book/vehicle", method = RequestMethod.POST)
     public ObjectRestResponse<String> rentApplyVehicle(@RequestBody BookVehicleVO bookVehicleVo);
+
+    @RequestMapping(value ="/branchCompany/app/unauth/detail/{id}",method = RequestMethod.GET)
+    public ObjectRestResponse<CompanyDetail> getCompanyDetail(@PathVariable Integer id);
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java

@@ -5,6 +5,7 @@ import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.BranchCompanyBiz;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.common.BaseController;
@@ -80,8 +81,8 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
 
     @ApiOperation("获取公司详情")
     @RequestMapping(value ="/app/unauth/detail/{id}",method = RequestMethod.GET)
-    public RestResponse<CompanyDetail> getDetail(@PathVariable Integer id) {
-        return RestResponse.data(baseBiz.getDetailById(id));
+    public ObjectRestResponse<CompanyDetail> getDetail(@PathVariable Integer id) {
+        return ObjectRestResponse.succ(baseBiz.getDetailById(id));
     }
 
     @RequestMapping(value ="",method = RequestMethod.POST)