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

ace-common/src/main/java/com/github/wxiaoqi/security/common/msg/ObjectRestResponse.java

@@ -75,7 +75,7 @@ public class ObjectRestResponse<T> extends BaseResponse {
      * @param message
      * @return
      */
-    public static     ObjectRestResponse createFailedResult(Integer code, String message) {
+    public static ObjectRestResponse createFailedResult(Integer code, String message) {
         return  new ObjectRestResponse().status(code).msg(message).rel(false);
     }
 
@@ -83,7 +83,7 @@ public class ObjectRestResponse<T> extends BaseResponse {
      * 操作失败
      * @return
      */
-    public static     ObjectRestResponse createDefaultFail() {
+    public static ObjectRestResponse createDefaultFail() {
         return  new ObjectRestResponse().status(WEB_CALL_RESULT_FAILED).msg(RESULT_FAIL_MSG).rel(false);
-    }
+}
 }

xx-order/xx-order-api/pom.xml

@@ -19,6 +19,12 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.xxfc.platform</groupId>
+            <artifactId>xx-tour-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
         <dependency>
             <groupId>com.xxfc.platform</groupId>
             <artifactId>xx-universal-api</artifactId>

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

@@ -91,9 +91,9 @@ public class OrderTourDetail implements Serializable {
     private String endCityName;
 	
 	    //自己乘客ids
-    @Column(name = "my_passager_ids")
-	@ApiModelProperty(value = "自己乘客ids")
-    private String myPassagerIds;
+    @Column(name = "tour_user_ids")
+	@ApiModelProperty(value = "出游乘客ids")
+    private String tourUserIds;
 	
 	    //出发公司Id
     @Column(name = "start_company_id")

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

@@ -4,10 +4,12 @@ import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.inter.OrderDetail;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
+import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import lombok.Data;
 
 @Data
 public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail {
     private BaseOrder order;
     private VehicleModel vehicleModel;
+    private BookVehicleVO bookVehicleVO;
 }

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

@@ -4,11 +4,15 @@ import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.entity.OrderTourDetail;
 import com.xxfc.platform.order.entity.inter.OrderDetail;
+import com.xxfc.platform.tour.entity.TourUser;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class TourBO extends OrderTourDetail implements OrderDetail {
     private BaseOrder order;
 //    private Tour
+    List<TourUser> tourUsers;
 }

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

+package com.xxfc.platform.order.pojo.price;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class TourPriceVO extends OrderPriceVO{
+    @ApiModelProperty(value = "车辆价格")
+    BigDecimal vehicleAmount;
+    @ApiModelProperty(value = "司机价格")
+    BigDecimal driverAmount;
+    @ApiModelProperty(value = "押金价格")
+    BigDecimal deposit;
+    @ApiModelProperty(value = "天数")
+    Integer dayNum;
+    @ApiModelProperty(value = "车辆个数")
+    Integer vehicleNum;
+    @ApiModelProperty(value = "司机个数")
+    Integer driverNum;
+    @ApiModelProperty(value = "车型名称")
+    String modelName;
+    @ApiModelProperty(value = "车型价格")
+    BigDecimal modelAmount;
+    @ApiModelProperty(value = "司机单价")
+    BigDecimal driverPrice;
+    @ApiModelProperty(value = "费用详情")
+    private String costDetail;
+}

xx-order/xx-order-server/pom.xml

@@ -26,18 +26,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.xxfc.platform</groupId>
-            <artifactId>xx-vehicle-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.xxfc.platform</groupId>
-            <artifactId>xx-tour-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
     </dependencies>
 
     <build>

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

@@ -7,11 +7,13 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderRentVehicleBiz;
+import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.service.OrderRentVehicleService;
 import com.xxfc.platform.order.pojo.AddRentVehicleDTO;
 import com.xxfc.platform.order.pojo.order.RentVehicleBO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
+import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -38,17 +40,21 @@ public class OrderRentVehicleController extends CommonBaseController {
         @RequestMapping(value = "add",method = RequestMethod.POST)
         @ResponseBody
         @ApiOperation(value = "确认租车订单")
-        public ObjectRestResponse<OrderRentVehicleDetail> add(@RequestBody AddRentVehicleDTO vo){
+        public ObjectRestResponse<BaseOrder> add(@RequestBody AddRentVehicleDTO vo){
             RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
+            bo.setBookVehicleVO(new BookVehicleVO(){{
+                    setBookStartDate(vo.getBookStartDate());
+                    setBookEndDate(vo.getBookEndDate());
+            }});
             orderRentVehicleService.createOrder(bo);
-            return new ObjectRestResponse<>().rel(true).data(bo.getOrder());
+            return ObjectRestResponse.succ(bo.getOrder());
         }
 
         @RequestMapping(value = "list-by-order/{orderId}",method = RequestMethod.GET)
         @ResponseBody
         @ApiOperation(value = "租车列表by订单Id")
         public ObjectRestResponse<OrderRentVehicleDetail> listByOrder(@PathVariable("orderId") Integer orderId){
-                return new ObjectRestResponse<>().data(orderRentVehicleBiz.listByOrderId(orderId));
+                return ObjectRestResponse.succ(orderRentVehicleBiz.listByOrderId(orderId));
         }
 
         @RequestMapping(value = "/app/unauth/calculate-price",method = RequestMethod.GET)
@@ -57,7 +63,7 @@ public class OrderRentVehicleController extends CommonBaseController {
         @IgnoreUserToken
         public ObjectRestResponse<RentVehiclePriceVO> calculatePrice(CalculatePriceVO vo){
                 RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
-                return new ObjectRestResponse<>().rel(true).data(orderRentVehicleService.calculatePrice(bo));
+                return ObjectRestResponse.succ(orderRentVehicleService.calculatePrice(bo));
         }
 
         @Data

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

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.order.biz.OrderTourDetailBiz;
+import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
 import com.xxfc.platform.order.entity.OrderTourDetail;
 import com.xxfc.platform.order.pojo.AddRentVehicleDTO;
 import com.xxfc.platform.order.pojo.AddTourDTO;
 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.order.pojo.price.TourPriceVO;
 import com.xxfc.platform.order.service.OrderTourService;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,6 +25,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import javax.persistence.Column;
+
 @Controller
 @RequestMapping("orderTour")
 public class OrderTourController extends BaseController<OrderTourDetailBiz,OrderTourDetail> {
@@ -28,9 +37,37 @@ public class OrderTourController extends BaseController<OrderTourDetailBiz,Order
     @RequestMapping(value = "add",method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "确认旅游订单")
-    public ObjectRestResponse<OrderRentVehicleDetail> add(@RequestBody AddTourDTO vo){
-        RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
+    public ObjectRestResponse<BaseOrder> add(@RequestBody AddTourDTO vo){
+        TourBO bo = BeanUtil.toBean(vo, TourBO.class);
         orderTourService.createOrder(bo);
-        return new ObjectRestResponse<>().rel(true).data(bo.getOrder());
+        return ObjectRestResponse.succ(bo.getOrder());
+    }
+
+    @RequestMapping(value = "/app/unauth/calculate-price",method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "价格计算")
+    @IgnoreUserToken
+    public ObjectRestResponse<TourPriceVO> calculatePrice(OrderRentVehicleController.CalculatePriceVO vo){
+        TourBO bo = BeanUtil.toBean(vo, TourBO.class);
+        return new ObjectRestResponse<>().rel(true).data(orderTourService.calculatePrice(bo));
+    }
+
+    @Data
+    public class CalculatePriceVO {
+        //商品id
+        @ApiModelProperty(value = "商品id")
+        private Integer goodId;
+
+        //商品规格ids
+        @ApiModelProperty(value = "商品规格ids")
+        private String speIds;
+
+        //具体商品（商品项）id
+        @ApiModelProperty(value = "具体商品（商品项）id")
+        private String spePriceId;
+
+        //自己乘客ids
+        @ApiModelProperty(value = "自己乘客ids")
+        private String tourUserIds;
     }
 }
\ No newline at end of file

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

@@ -32,7 +32,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
     private static BigDecimal DRIVER_PRICE = new BigDecimal("600.00");
     private static BigDecimal DAMAGE_SAFE = new BigDecimal("100.00"); //车损免赔
     private static Integer DRIVER_TYPE_COMPANY = 1;
-    private static BigDecimal DEPOSIT = new BigDecimal("20000.00");
+//    private static BigDecimal DEPOSIT = new BigDecimal("20000.00");
 
     @Autowired
     VehicleFeign vehicleFeign;
@@ -95,7 +95,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             //商品价格
         goodsAmount = goodsAmount.add(vehicleAmount).add(driverAmount);
             //总价格（包含押金）
-        orderAmount = orderAmount.add(goodsAmount).add(DEPOSIT);
+        orderAmount = orderAmount.add(goodsAmount).add(vehicleModel.getDeposit());
 
         //生成订单明细
         RentVehiclePriceVO rvp = new RentVehiclePriceVO();
@@ -104,7 +104,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         rvp.setDriverAmount(driverAmount);
         rvp.setVehicleAmount(vehicleAmount);
         rvp.setRealAmount(orderAmount);
-        rvp.setDeposit(DEPOSIT);
+        rvp.setDeposit(vehicleModel.getDeposit());
         rvp.setModelAmount(vehicleModel.getPrice());
         rvp.setDriverPrice(DRIVER_PRICE);
         rvp.setModelName(vehicleModel.getName());
@@ -133,9 +133,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
     private String acquireVehicle(RentVehicleBO detail) {
         //根据车型、时间、距离，门店，预定车辆
-//        BookVehicleVO bookVehicleVO = new BookVehicleVO(){{
-//           setBookStartDate(detail);
-//        }};
+        BookVehicleVO bookVehicleVO = new BookVehicleVO(){{
+//           setBookStartDate(detail.getS);
+        }};
 //        vehicleFeign.rentApplyVehicle()
         String vehicleId =  "0e9a88db-cb1b-48a4-b307-40f89eed906f";
         detail.setVehicleId(vehicleId);

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

@@ -31,8 +31,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderRentVehicleBiz, T
 
     private static BigDecimal DRIVER_PRICE = new BigDecimal("600.00");
     private static BigDecimal DAMAGE_SAFE = new BigDecimal("100.00"); //车损免赔
-    private static Integer DRIVER_TYPE_COMPANY = 1;
-    private static BigDecimal DEPOSIT = new BigDecimal("20000.00");
+//    private static BigDecimal DEPOSIT = new BigDecimal("20000.00");
 
     @Autowired
     VehicleFeign vehicleFeign;
@@ -79,8 +78,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderRentVehicleBiz, T
     public RentVehiclePriceVO calculatePrice(TourBO detail) {
         BigDecimal orderAmount = BigDecimal.ZERO;
         BigDecimal goodsAmount = BigDecimal.ZERO;
-        BigDecimal vehicleAmount = BigDecimal.ZERO;
-        BigDecimal driverAmount = BigDecimal.ZERO;
+        BigDecimal tourAmount = BigDecimal.ZERO;
 
         //计算价格
             //计算车辆费用
@@ -91,18 +89,18 @@ public class OrderTourService extends AbstractOrderHandle<OrderRentVehicleBiz, T
 //            driverAmount = driverAmount.add(DRIVER_PRICE.multiply(BigDecimal.valueOf(detail.getDayNum())));
 //        }
             //商品价格
-        goodsAmount = goodsAmount.add(vehicleAmount).add(driverAmount);
+//        goodsAmount = goodsAmount.add(vehicleAmount).add(driverAmount);
             //总价格（包含押金）
-        orderAmount = orderAmount.add(goodsAmount).add(DEPOSIT);
+//        orderAmount = orderAmount.add(goodsAmount).add(DEPOSIT);
 
         //生成订单明细
         RentVehiclePriceVO rvp = new RentVehiclePriceVO();
         rvp.setOrderAmount(orderAmount);
         rvp.setGoodsAmount(goodsAmount);
-        rvp.setDriverAmount(driverAmount);
-        rvp.setVehicleAmount(vehicleAmount);
+//        rvp.setDriverAmount(driverAmount);
+//        rvp.setVehicleAmount(vehicleAmount);
         rvp.setRealAmount(orderAmount);
-        rvp.setDeposit(DEPOSIT);
+//        rvp.setDeposit(DEPOSIT);
 //        rvp.setModelAmount(vehicleModel.getPrice());
         rvp.setDriverPrice(DRIVER_PRICE);
 //        rvp.setModelName(vehicleModel.getName());

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -61,6 +61,11 @@ public class VehicleModel implements Serializable {
 	@Column(name = "price")
 	@ApiModelProperty(value = "价格")
 	private BigDecimal price;
+
+	//价格
+	@Column(name = "deposit")
+	@ApiModelProperty(value = "押金")
+	private BigDecimal deposit;
 	
 	    //创建时间
     @Column(name = "crt_time")