修改实体

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/constant/enumerate/MemberEnum.java

+package com.github.wxiaoqi.security.admin.constant.enumerate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum MemberEnum {
+    NONE(0, "非会员"),
+    NORMAL(1, "普通会员"),
+    GOLD(2, "黄金会员"),
+    DIAMOND(3, "钻石会员"),
+    ;
+    /**
+     * 编码
+     */
+    private Integer code;
+    /**
+     * 类型描述
+     */
+    private String desc;
+
+    private static Map<Integer,String> codeAndDesc = new HashMap<Integer, String>();
+
+    MemberEnum(Integer code, String desc){
+        this.code=code;
+        this.desc=desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public static Boolean exists(Integer code){
+        return codeAndDesc.containsKey(code);
+    }
+}
\ No newline at end of file

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

 package com.xxfc.platform.order.entity;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +12,7 @@ import lombok.Data;
  * 
  * @author zjw
  * @email nishijjo@qq.com
- * @date 2019-06-15 14:18:42
+ * @date 2019-06-15 17:11:08
  */
 @Data
 @Table(name = "order_rent_vehicle_detail")
@@ -253,9 +252,18 @@ public class OrderRentVehicleDetail implements Serializable {
     private Long collectTime;
 	
 	    /**
-	 *  免费天数
+     *  优惠天数
      */
     @Column(name = "free_days")
-	@ApiModelProperty(value = "免费天数")
-	private Long freeDays;
+	@ApiModelProperty(value = "优惠天数")
+    private Integer freeDays;
+	
+	    /**
+     *  出发公司区域id
+     */
+    @Column(name = "start_zone_id")
+	@ApiModelProperty(value = "出发公司区域id")
+    private Integer startZoneId;
+	
+
 }

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

@@ -12,7 +12,7 @@ import lombok.Data;
  * 
  * @author zjw
  * @email nishijjo@qq.com
- * @date 2019-06-15 14:18:42
+ * @date 2019-06-15 17:11:08
  */
 @Data
 @Table(name = "order_tour_detail")
@@ -223,5 +223,12 @@ public class OrderTourDetail implements Serializable {
 	@ApiModelProperty(value = "核销时间")
     private Long verificationTime;
 	
+	    /**
+     *  出发公司区域id
+     */
+    @Column(name = "start_zone_id")
+	@ApiModelProperty(value = "出发公司区域id")
+    private Integer startZoneId;
+	
 
 }

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

 package com.xxfc.platform.order.pojo.order;
 
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.entity.inter.OrderDetail;
 import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
@@ -13,4 +14,5 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
     private VehicleModel vehicleModel;
     private BookVehicleVO bookVehicleVO;
     private Integer damageSafe;
+    private AppUserDTO appUserDTO;
 }

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

 package com.xxfc.platform.order.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
@@ -38,6 +41,9 @@ public class OrderRentVehicleController extends CommonBaseController {
         @Autowired
         BaseOrderBiz baseOrderBiz;
 
+        @Autowired
+        UserFeign userFeign;
+
         @RequestMapping(value = "add",method = RequestMethod.POST)
         @ResponseBody
         @ApiOperation(value = "确认租车订单")
@@ -47,6 +53,7 @@ public class OrderRentVehicleController extends CommonBaseController {
                     setBookStartDate(vo.getBookStartDate());
                     setBookEndDate(vo.getBookEndDate());
             }});
+            bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
             orderRentVehicleService.createOrder(bo);
             return ObjectRestResponse.succ(bo.getOrder());
         }
@@ -64,6 +71,9 @@ public class OrderRentVehicleController extends CommonBaseController {
         @IgnoreUserToken
         public ObjectRestResponse<RentVehiclePriceVO> calculatePrice(CalculatePriceVO vo){
                 RentVehicleBO bo = BeanUtil.toBean(vo, RentVehicleBO.class);
+                if(StrUtil.isNotBlank(BaseContextHandler.getToken())) {
+                        bo.setAppUserDTO(userFeign.userDetailByToken(BaseContextHandler.getToken()).getData());
+                }
                 return ObjectRestResponse.succ(orderRentVehicleService.calculatePrice(bo));
         }
 

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

@@ -6,6 +6,7 @@ import cn.hutool.extra.template.Template;
 import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
+import com.github.wxiaoqi.security.admin.constant.enumerate.MemberEnum;
 import com.github.wxiaoqi.security.common.context.BaseContextHandler;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.order.biz.OrderCostDetailBiz;
@@ -96,6 +97,9 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         //计算价格
             //计算车辆费用
         VehicleModel vehicleModel = vehicleFeign.get(detail.getModelId()).getData();
+
+//        detail.getAppUserDTO()
+//        if(null != detail.getAppUserDTO() && MemberEnum.NONE.equals(detail.getAppUserDTO()))
         vehicleAmount = vehicleAmount.add(vehicleModel.getPrice().multiply(BigDecimal.valueOf(detail.getDayNum())));
         if(DRIVER_TYPE_COMPANY.equals(detail.getDriverType())) {
             //计算司机费用