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

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

@@ -20,12 +20,29 @@ import java.util.List;
 public class TourUserBiz extends BaseBiz<TourUserMapper,TourUser> {
 
 
-
-    public List<TourUser> getTourUser(Integer id, Integer isChild) {
+    /**
+     * 获取全部成人或儿童
+     * @param id 用户id
+     * @param isChild 0-儿童 1-成年人
+     * @return
+     */
+    public List<TourUser> findListByTourUserByIsChild(Integer id, Integer isChild) {
         TourUser user = new TourUser();
         user.setUserid(id);
         user.setIsdel(0);
         user.setIsChild(isChild);
+        return mapper.findListByTourUserByIsChild(user);
+    }
+
+    /**
+     * 获得全部出游人信息
+     * @param id 用户id
+     * @return
+     */
+    public List<TourUser> getTourUser(Integer id) {
+        TourUser user = new TourUser();
+        user.setUserid(id);
+        user.setIsdel(0);
         return mapper.findListByTourUser(user);
     }
 

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

@@ -20,5 +20,8 @@ import java.util.List;
 public interface TourUserMapper extends Mapper<TourUser> {
 
     @Select("select * from tour_user where userid=${userid} and is_child=${isChild} and isdel=${isdel}")
+    List<TourUser> findListByTourUserByIsChild(TourUser user);
+
+    @Select("select * from tour_user where userid=${userid}  and isdel=${isdel}")
     List<TourUser> findListByTourUser(TourUser user);
 }

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

@@ -22,15 +22,22 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
     @Autowired
     private TourUserBiz tourUserBiz;
 
+
+    /**
+     * 获取全部成人或儿童
+     * @param isChild 0-儿童 1-成年人
+     * @return
+     */
     @GetMapping("/app/unauth/getTourUser/{isChild}")
-    public ObjectRestResponse getTourUser(@PathVariable int isChild){
+    public ObjectRestResponse findListByTourUserByIsChild(@PathVariable int isChild){
         AppUserDTO userInfo = getUserInfo();
         Integer id = userInfo.getId();
-        List<TourUser> tourUsers= baseBiz.getTourUser(id,isChild);
+        List<TourUser> tourUsers= baseBiz.findListByTourUserByIsChild(id,isChild);
 
        return ObjectRestResponse.succ(tourUsers);
     }
 
+
     @GetMapping("/app/unauth/getTourUsers")
     public ObjectRestResponse<List<TourUser>> getTourUsers(@ApiParam(name = "ids") String ids){
         List<TourUser> tourUsers= tourUserBiz.selectByExample(new Example.Builder(TourUser.class)
@@ -56,4 +63,17 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
     }
 
 
+    /**
+     * 获取全部出游人信息
+     * @return
+     */
+    @GetMapping("/app/unauth/getTourUserList")
+    public ObjectRestResponse getTourUser(){
+        AppUserDTO userInfo = getUserInfo();
+        Integer id = userInfo.getId();
+        List<TourUser> tourUsers= baseBiz.getTourUser(id);
+        return ObjectRestResponse.succ(tourUsers);
+    }
+
+
 }
\ No newline at end of file

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

@@ -33,20 +33,20 @@ public class VehicleModel implements Serializable {
 	@ApiModelProperty(value = "名称")
     private String name;
 	
-	    //配置，code逗号分割
+	    //房车配置，code逗号分割
     @Column(name = "config")
-	@ApiModelProperty(value = "配置，code逗号分割")
+	@ApiModelProperty(value = "房车配置，code逗号分割")
     private String config;
 	
-	    //关键字，code逗号分割
+	    //关键标签，code逗号分割
     @Column(name = "keyword")
-	@ApiModelProperty(value = "关键字，code逗号分割")
+	@ApiModelProperty(value = "关键标签，code逗号分割")
     private String keyword;
 
-		//房车展示
-	@Column(name = "model_show")
-	@ApiModelProperty(value = "房车展示")
-	private String modelShow;
+		//车型详情
+	@Column(name = "models_details")
+	@ApiModelProperty(value = "车型详情")
+	private String modelsDetails;
 
 		//参数
 	@Column(name = "model_param")
@@ -63,10 +63,20 @@ public class VehicleModel implements Serializable {
 	@ApiModelProperty(value = "价格")
 	private BigDecimal price;
 
-	//价格
+	//会员价格
+	@Column(name = "vip_price")
+	@ApiModelProperty(value = "会员价格")
+	private BigDecimal vipPrice;
+
+	//总押金
 	@Column(name = "deposit")
-	@ApiModelProperty(value = "押金")
+	@ApiModelProperty(value = "总押金")
 	private BigDecimal deposit;
+
+	//违章押金
+	@Column(name = "vio_deposit")
+	@ApiModelProperty(value = "违章押金")
+	private BigDecimal vioDeposit;
 	
 	    //创建时间
     @Column(name = "crt_time")

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelQueryCondition.java

@@ -10,9 +10,9 @@ public class VehicleModelQueryCondition {
     @ApiModelProperty(value = "每页条数")
     private Integer limit;
     @ApiModelProperty(value = "房车型号")
-    private String  vehileModel;
+    private String  vehicleType;
     @ApiModelProperty(value = "房车名")
-    private String  vehileName;
+    private String  vehicleName;
     @ApiModelProperty(value = "乘卧数")
     private String  takeALieTheNumber;
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelBiz.java

 package com.xxfc.platform.vehicle.biz;
 
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.mapper.VehicleModelMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
+import java.util.List;
+
 /**
  * 车型
  *
@@ -16,6 +20,7 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  * @date 2019-05-21 14:15:27
  */
 @Service
+@Slf4j
 public class VehicleModelBiz extends BaseBiz<VehicleModelMapper,VehicleModel> {
 
 
@@ -27,14 +32,16 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper,VehicleModel> {
         updateSelectiveById(model);
     }
 
-    public VehicleModel findVehicleModelPage(VehicleModelQueryCondition vmqc){
+    public ObjectRestResponse findVehicleModelPage(VehicleModelQueryCondition vmqc){
+
+        List<VehicleModel> vehicleModelPage = mapper.findVehicleModelPage(vmqc);
 
+    log.debug("vehicleModelPage"+vehicleModelPage);
 
         PageDataVO<VehicleModel> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),
                 vmqc.getLimit(), ()  -> mapper.findVehicleModelPage(vmqc));
 
-
-        return null;
+        return ObjectRestResponse.succ(mPageDataVO);
     }
 
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleModelMapper.java

@@ -4,6 +4,8 @@ import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 /**
  * 车型
  * 
@@ -13,5 +15,5 @@ import tk.mybatis.mapper.common.Mapper;
  */
 public interface VehicleModelMapper extends Mapper<VehicleModel> {
 
-    VehicleModel findVehicleModelPage(VehicleModelQueryCondition vmqc);
+    List<VehicleModel> findVehicleModelPage(VehicleModelQueryCondition vmqc);
 }

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

 package com.xxfc.platform.vehicle.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
@@ -14,8 +17,14 @@ import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
 
 @RestController
 @RequestMapping("vehicleModel")
@@ -23,10 +32,13 @@ import org.springframework.web.bind.annotation.*;
 public class VehicleModelController extends BaseController<VehicleModelBiz,VehicleModel> {
 
     @Autowired
-    VehiclePlatCataBiz vehiclePlatCataBiz;
+    private VehiclePlatCataBiz vehiclePlatCataBiz;
 
     @Autowired
-    VehicleModelBiz  vehicleModelBiz;
+    private VehicleModelBiz  vehicleModelBiz;
+    
+    @Autowired
+    private UserFeign userFeign;
 
     //修改评分
     @RequestMapping(value = "/app/addScore", method = RequestMethod.GET)
@@ -53,23 +65,63 @@ public class VehicleModelController extends BaseController<VehicleModelBiz,Vehic
 
     /**
      * 车型列表查询
+     *
      * @param vmqc 条件
      * @return
      */
     @ApiOperation("车型列表")
     @PostMapping(value = "/app/findVehicleModelPage")
     public ObjectRestResponse<VModelDetailVO> findVehicleModelPage(
-            @RequestBody@ApiParam("查询条件") VehicleModelQueryCondition vmqc){
+            @RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc) {
 
-        if (vmqc==null||vmqc.getPage()<0||vmqc.getLimit()<=0) {
+        if (vmqc == null || vmqc.getPage() == null || vmqc.getLimit() == null || vmqc.getPage() < 0 || vmqc.getLimit() <= 0) {
             return ObjectRestResponse.createDefaultFail();
         }
 
+        return vehicleModelBiz.findVehicleModelPage(vmqc);
+    }
+
+    /**
+     * 添加车型
+     * @param vm 接收前天的数据
+     * @param request
+     * @return
+     */
+    @ApiOperation("添加")
+    @PostMapping(value = "add")
+    @ResponseBody
+    public ObjectRestResponse<VehicleModel> add(@RequestBody VehicleModel vm,HttpServletRequest request){
+        if (vm==null) {
+           return ObjectRestResponse.createDefaultFail();
+        }
 
+        if (StringUtils.isBlank(vm.getName())) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"无车名");
+        }
 
-        VehicleModel vehicleModel=vehicleModelBiz.findVehicleModelPage(vmqc);
-        return  ObjectRestResponse.succ(vehicleModel);
-    }
+        String token = request.getHeader("Authorization");
+        if (StringUtils.isBlank(token)){
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"请登录");
+        }
+        ObjectRestResponse<UserDTO> uorr = userFeign.userinfoByToken(token);
+
+        if (uorr==null||uorr.getData()==null||StringUtils.isBlank(uorr.getData().getName())) {
+            return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"获取不到用户信息");
+        }
+
+
+        Integer id = uorr.getData().getId();
+//        vm.set
 
+        //获取域名
+        String host = request.getRemoteHost();
+        if (StringUtils.isBlank(host)) {
+            return ObjectRestResponse.createDefaultFail();
+        }
+
+
+        baseBiz.insertSelective(vm);
+        return new ObjectRestResponse<VehicleModel>();
+    }
 
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleModelMapper.xml

@@ -2,23 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleModelMapper">
   <select id="findVehicleModelPage" parameterType="com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition"
-          resultMap="vehicleModel">
-      select  * from  vehicle_model vm left join  vehicle v on vm.id=v.model_id and 1=1
-      <if test="vmqc.vehicleType!=null and vmqc.vehicleType!=''">
-       and  v.keyword like CONCAT('%,',#{vmqc.vehicleType},',%')
-      </if>
+          resultType="com.xxfc.platform.vehicle.entity.VehicleModel">
+      SELECT * from
+      (select vm.*,v.sum,v2.leasableQuantity from  vehicle_model  vm left JOIN
+      (select model_id as mid, count(1) as sum FROM vehicle GROUP BY mid)  v
+      on vm.id=v.mid left JOIN
+      (select model_id as mid2, count(1) as leasableQuantity FROM vehicle where`status`=1 GROUP BY model_id)  v2
+      on v.mid=v2.mid2 ) vmqc WHERE 1=1
 
-      <if test="vmqc.vehicleName!=null and vmqc.vehicleName!=''">
-          and  v.name like CONCAT('%',#{vmqc.vehicleName},'%')
+      <if test="vehicleName !=null and vehicleName !=''">
+        AND  vmqc.name LIKE CONCAT('%',#{vehicleName},'%')
       </if>
 
-      <if test="vmqc.takeAlieTheNumber!=null and vmqc.takeAlieTheNumber!=''">
-       and  v.keyword like CONCAT('%,',#{vmqc.takeAlieTheNumber},',%')
+      <if test="vehicleType!=null and vehicleType!=''">
+        AND  EXISTS (SELECT vc.vehicle_model_id  FROM vehicle_cata vc WHERE vc.cata_id=#{vehicleType} AND vmqc.id=vc.vehicle_model_id )
       </if>
 
+      <if test="takeALieTheNumber!=null and takeALieTheNumber!=''">
+        AND  EXISTS(SELECT vc2.vehicle_model_id FROM vehicle_cata vc2 WHERE vc2.cata_id=#{takeALieTheNumber} AND vmqc.id=vc2.vehicle_model_id)
+      </if>
+      ORDER BY	vmqc.id ASC
   </select>
-    <resultMap id="vehicleModel" type="com.xxfc.platform.vehicle.entity.VehicleModel" >
-       <id property="id" column="id"></id>
-    </resultMap>
 
 </mapper>
\ No newline at end of file