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

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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java

@@ -32,4 +32,7 @@ public class AppUserDetail {
 	private Long updatetime;
 	private Integer isdel;
 
+	@Column(name = "rent_free_days")
+	private Integer rentFreeDays;
+
 }

ace-modules/ace-generator/src/main/resources/application.yml

@@ -10,7 +10,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.jdbc.Driver
-        url: jdbc:mysql://10.5.52.3:3306/ag_admin_v1?useUnicode=true&characterEncoding=UTF-8
+        url: jdbc:mysql://10.5.52.3:3306/xxfc_order?useUnicode=true&characterEncoding=UTF-8
         username: root
         password: sslcloud123*()
     jackson:

ace-modules/ace-generator/src/main/resources/generator.properties

 #代码生成器，配置信息
 
 #包名
-package=package com.github.wxiaoqi.security.admin
+package=com.xxfc.platform.order
 #作者
 author=zjw
 #Email

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/contant/enumerate/OrderTypeEnum.java

@@ -6,6 +6,7 @@ import java.util.Map;
 public enum OrderTypeEnum {
     RentVehicle(1, "租车订单"),
     TOUR(2, "旅游订单"),
+    MEMBER(3, "会员订单"),
     ;
     /**
      * 编码

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

@@ -188,6 +188,11 @@ public class BaseOrder implements Serializable {
     @Column(name = "refund_time")
 	@ApiModelProperty(value = "退款时间")
     private Long refundTime;
-	
 
+	/**
+	 *  是否有优惠
+	 */
+	@Column(name = "has_discount")
+	@ApiModelProperty(value = "是否有优惠")
+	private Long hasDiscount;
 }

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

@@ -13,7 +13,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")
@@ -252,5 +252,19 @@ public class OrderRentVehicleDetail implements Serializable {
 	@ApiModelProperty(value = "收车时间")
     private Long collectTime;
 	
+	    /**
+     *  优惠天数
+     */
+    @Column(name = "free_days")
+	@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())) {
             //计算司机费用

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodOrderFindVo.java

@@ -3,7 +3,7 @@ package com.xxfc.platform.tour.vo;
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 /**
@@ -19,19 +19,19 @@ public class TourGoodOrderFindVo extends PageParam {
     /**
      * 公司id
      */
-    @NotEmpty(message = "公司id不能为空")
+    @NotNull(message = "公司id不能为空")
     private Integer companyId;
 
     /**
      * 订单状态
      */
-    @NotEmpty(message = "订单状态不能为空")
+    @NotNull(message = "订单状态不能为空")
     private Integer  orderStatus;
 
     /**
      *出发时间
      */
-    @NotEmpty(message = "出发时间不断能空")
+    @NotNull(message = "出发时间不断能空")
     private Date trvaelTime;
 
     private String travelDate;

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodOrderVo.java

 package com.xxfc.platform.tour.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -18,6 +21,7 @@ import java.util.Date;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
+@ApiModel("旅游订单vo")
 public class TourGoodOrderVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -25,50 +29,60 @@ public class TourGoodOrderVo implements Serializable {
     /**
      * 核销订单id
      */
+    @ApiModelProperty("核销订单id")
     private Integer id;
 
     /**
      * 商品名称
      */
+    @ApiModelProperty("商品名称")
      private String name;
 
     /**
      * 封面
      */
+    @ApiModelProperty("封面")
     private String coverUrl;
 
     /**
      * 出行时间
      */
+    @ApiModelProperty("出行时间")
     private String travelTime;
 
     /**
      * 总人数
      */
+    @ApiModelProperty("总人数")
     private int  headcount;
 
     /**
-     * 未上车人数
+     * 已上车人数
      */
+    @ApiModelProperty("已上车人数")
     private int  tripOfNum;
 
     /**
-     * 已上车人数
+     * 未上车人数
      */
+    @ApiModelProperty("未上车人数")
     private  int  leaveOfnum;
 
     /**
      * 是否出行  '状态：0-未出行；1-已出行'
      */
+    @ApiModelProperty("出行与否")
     private  Integer  travelStatus;
 
     /**
      * 开始出行日期
      */
+    @JsonIgnore
     private Date startDate;
 
     /**
      * 开始出行时间
      */
-    private Date startTime;
+    @JsonIgnore
+    private Long startTime;
 }

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

@@ -32,6 +32,4 @@ public class TourApplication {
     public static void main(String[] args) {
         SpringApplication.run(TourApplication.class, args);
     }
-
-
 }

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

@@ -9,6 +9,7 @@ import  com.xxfc.platform.tour.entity.TourGoodVerification;
 import  com.xxfc.platform.tour.mapper.TourGoodVerificationMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
+import java.time.LocalTime;
 import java.util.*;
 
 /**
@@ -49,7 +50,15 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
          tourGoodOrderVos.stream().peek(tourGoodOrderVo -> {
             tourGoodOrderVo.setLeaveOfnum(tourGoodOrderVo.getHeadcount()-tourGoodOrderVo.getTripOfNum());
             String startDateStr = DateUtil.format(tourGoodOrderVo.getStartDate(),"YYYY.MM.dd");
-            tourGoodOrderVo.setTravelTime(startDateStr);
+             tourGoodOrderVo.setTravelTime(startDateStr);
+
+             Long startTime = tourGoodOrderVo.getStartTime();
+             if (null!=startTime){
+                 LocalTime localTime = LocalTime.ofSecondOfDay(startTime);
+                 String timeStr = String.format("%s:%s:%s",localTime.getHour()==0?"00":localTime.getHour(),
+                         localTime.getMinute()==0?"00":localTime.getMinute(),localTime.getSecond()==0?"00":localTime.getSecond());
+                 tourGoodOrderVo.setTravelTime(String.format("%s %s",tourGoodOrderVo.getTravelTime(),timeStr));
+             }
         }).count();
         return tourGoodOrderVoPageDataVO;
     }