修改代码

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/TourBO.java

@@ -13,6 +13,7 @@ import java.util.List;
 @Data
 public class TourBO extends OrderTourDetail implements OrderDetail {
     private BaseOrder order;
-//    private Tour
     List<TourUser> tourUsers;
+    Integer number;
+    Integer childNumber;
 }

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

@@ -47,9 +47,9 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz,Order
     @ResponseBody
     @ApiOperation(value = "价格计算")
     @IgnoreUserToken
-    public ObjectRestResponse<TourPriceVO> calculatePrice(OrderRentVehicleController.CalculatePriceVO vo){
+    public ObjectRestResponse<TourPriceVO> calculatePrice(CalculatePriceVO vo){
         TourBO bo = BeanUtil.toBean(vo, TourBO.class);
-        return new ObjectRestResponse<>().rel(true).data(orderTourService.calculatePrice(bo));
+        return ObjectRestResponse.succ(orderTourService.calculatePrice(bo));
     }
 
     @Data

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

@@ -16,6 +16,8 @@ import com.xxfc.platform.order.entity.OrderCostDetail;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.order.TourBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
+import com.xxfc.platform.tour.dto.TourSpePriceDTO;
+import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import lombok.extern.log4j.Log4j;
@@ -29,6 +31,9 @@ import java.math.BigDecimal;
 @Log4j
 public class OrderTourService extends AbstractOrderHandle<OrderRentVehicleBiz, TourBO> {
 
+    @Autowired
+    TourFeign tourFeign;
+
     private static BigDecimal DRIVER_PRICE = new BigDecimal("600.00");
     private static BigDecimal DAMAGE_SAFE = new BigDecimal("100.00"); //车损免赔
 //    private static BigDecimal DEPOSIT = new BigDecimal("20000.00");
@@ -80,6 +85,12 @@ public class OrderTourService extends AbstractOrderHandle<OrderRentVehicleBiz, T
         BigDecimal goodsAmount = BigDecimal.ZERO;
         BigDecimal tourAmount = BigDecimal.ZERO;
 
+        //计算旅游价格
+        tourFeign.refund(new TourSpePriceDTO(){{
+            setChildNumber(detail.getChildNumber());
+            setChildNumber(detail.getChildNumber());
+        }});
+
         //计算价格
             //计算车辆费用
 //        VehicleModel vehicleModel = vehicleFeign.get(detail.getModelId()).getData();
@@ -108,7 +119,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderRentVehicleBiz, T
         rvp.setVehicleNum(1);
         rvp.setDriverNum(1);
 
-        detail.setCostDetail(costDetail(rvp));
+        //detail.setCostDetail(costDetail(rvp));
         return rvp;
     }
 

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/TourSpePriceDto.java → xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/TourSpePriceDTO.java

@@ -4,13 +4,11 @@ package com.xxfc.platform.tour.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * 计算价格
  */
 @Data
-public class TourSpePriceDto {
+public class TourSpePriceDTO {
 
 	//用户id
 	@ApiModelProperty(value = "用户id")

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

@@ -2,7 +2,7 @@ package com.xxfc.platform.tour.feign;
 
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.xxfc.platform.tour.dto.TourSpePriceDto;
+import com.xxfc.platform.tour.dto.TourSpePriceDTO;
 import com.xxfc.platform.tour.vo.TourSpePriceVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,8 +18,15 @@ import org.springframework.web.bind.annotation.RequestMethod;
  */
 @FeignClient(value = "xx-tour")
 public interface TourFeign {
+
+    /**
+     * 计算价格
+     * @param spePriceDto
+     * @return
+     */
     @RequestMapping(value = "/spe/user/prices", method = RequestMethod.POST)
-    public ObjectRestResponse<TourSpePriceVo> prices(@RequestBody TourSpePriceDto spePriceDto);
+    public ObjectRestResponse<TourSpePriceVo> refund(@RequestBody TourSpePriceDTO spePriceDto);
+
     @RequestMapping(value = "/spe/stock", method = RequestMethod.GET)
     public ObjectRestResponse<TourSpePriceVo> stock(Integer speId,Integer number);
 

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

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.xxfc.platform.tour.dto.TourSpePriceDto;
+import com.xxfc.platform.tour.dto.TourSpePriceDTO;
 import com.xxfc.platform.tour.entity.TourGoodSpePrice;
 import com.xxfc.platform.tour.mapper.TourGoodSpePriceMapper;
 import com.xxfc.platform.tour.vo.TourSpePriceVo;
@@ -27,7 +27,7 @@ import java.math.RoundingMode;
 @Slf4j
 public class TourGoodSpeBiz extends BaseBiz<TourGoodSpePriceMapper, TourGoodSpePrice> {
 
-    public ObjectRestResponse<TourSpePriceVo> getPricesByuserid(TourSpePriceDto priceDto) {
+    public ObjectRestResponse<TourSpePriceVo> getPricesByuserid(TourSpePriceDTO priceDto) {
         if (priceDto == null || priceDto.getUserId() == null || priceDto.getUserId() == 0 ||
                 priceDto.getNumber() == null || priceDto.getNumber() == 0||priceDto.getSpeId()==null) {
             return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");

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

-package com.xxfc.platform.tour.rest;
-
-import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.xxfc.platform.tour.biz.TourGoodSpeBiz;
-import com.xxfc.platform.tour.common.TourBaseController;
-import com.xxfc.platform.tour.dto.TourSpePriceDto;
-import com.xxfc.platform.tour.vo.TourSpePriceVo;
-import org.springframework.web.bind.annotation.*;
-
-@RestController
-@RequestMapping("spe")
-@IgnoreClientToken
-public class TourGoodSpeController extends TourBaseController<TourGoodSpeBiz> {
-
-
-
-    //获取商品详情
-    @RequestMapping(value = "/user/prices", method = RequestMethod.POST)
-    public ObjectRestResponse<TourSpePriceVo> prices(@RequestBody TourSpePriceDto priceDto) {
-        return   baseBiz.getPricesByuserid(priceDto);
-    }
-
-    //减库存
-    @RequestMapping(value = "/stock", method = RequestMethod.GET)
-    public ObjectRestResponse<TourSpePriceVo> stock(
-            @RequestParam(value = "speId",defaultValue = "0")Integer speId,
-            @RequestParam(value = "number",defaultValue = "0") Integer number){
-        return   baseBiz.cutStock(speId,number);
-    }
-
-
+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.xxfc.platform.tour.biz.TourGoodSpeBiz;
+import com.xxfc.platform.tour.common.TourBaseController;
+import com.xxfc.platform.tour.dto.TourSpePriceDTO;
+import com.xxfc.platform.tour.vo.TourSpePriceVo;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("spe")
+@IgnoreClientToken
+public class TourGoodSpeController extends TourBaseController<TourGoodSpeBiz> {
+
+
+
+    //获取商品详情
+    @RequestMapping(value = "/user/prices", method = RequestMethod.POST)
+    public ObjectRestResponse<TourSpePriceVo> prices(@RequestBody TourSpePriceDTO priceDto) {
+        return baseBiz.getPricesByuserid(priceDto);
+    }
+
+    //减库存
+    @RequestMapping(value = "/stock", method = RequestMethod.GET)
+    public ObjectRestResponse<TourSpePriceVo> stock(
+            @RequestParam(value = "speId",defaultValue = "0")Integer speId,
+            @RequestParam(value = "number",defaultValue = "0") Integer number){
+        return   baseBiz.cutStock(speId,number);
+    }
+
 }
\ No newline at end of file