Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java

 package com.github.wxiaoqi.security.admin.dto;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.util.Date;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -49,6 +45,11 @@ public class AppUserManageDTO {
 
     private Long registrationTimeEnd;
 
+    /**
+     * 身份标识 0：除普通用户外  1:与1相反
+     */
+    private Integer postionState;
+
     /**
      * 用户来源:0-自来,1-用户邀请
      */

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserManageVo.java

@@ -166,4 +166,9 @@ public class AppUserManageVo {
      * 邀请人用户名
      */
     private String inviter;
+
+    /**
+     * 身份信息
+     */
+    private String positionName;
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserDetailBiz.java

@@ -5,6 +5,7 @@ import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.mapper.AppUserDetailMapper;
 import com.github.wxiaoqi.security.admin.rpc.service.AppPermissionService;
+import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.apache.commons.beanutils.BeanUtils;
@@ -128,4 +129,19 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
     public void updateUserPositionByUserId(Integer userId, Integer positionId) {
         mapper.updateUserPositionByUserId(userId,positionId);
     }
+
+    public AppUserInfoVo findUserInfoByCode(String code) {
+        AppUserInfoVo appUserInfoVo = new AppUserInfoVo();
+
+        AppUserDetail appUserDetail = new AppUserDetail();
+        appUserDetail.setCode(code);
+        AppUserDetail userDetail = mapper.selectOne(appUserDetail);
+
+        if (userDetail==null){
+            return appUserInfoVo;
+        }
+       appUserInfoVo.setHeadimgurl(userDetail.getHeadimgurl());
+        appUserInfoVo.setNickname(userDetail.getNickname());
+        return  appUserInfoVo;
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserSellingWaterBiz.java

@@ -348,7 +348,8 @@ public class AppUserSellingWaterBiz extends BaseBiz<AppUserSellingWaterMapper, A
     public void deleteByMemberIds(Collection<Integer> userIds) {
          Example example = new Example(AppUserSellingWater.class);
         Example.Criteria criteria = example.createCriteria();
-        criteria.andIn("sourceId",userIds);
+        criteria.orIn("sourceId",userIds);
+        criteria.orIn("userId",userIds);
         mapper.deleteByExample(example);
     }
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -5,8 +5,11 @@ import com.github.wxiaoqi.security.admin.biz.*;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
+import com.github.wxiaoqi.security.admin.vo.AppUserInfoVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
@@ -269,4 +272,12 @@ public class AppUserController extends CommonBaseController {
     Map<String, Integer> findAppusersByUserNames(@RequestParam(value = "phones") List<String> phones){
         return appUserLoginBiz.findPhoneAndUserIdMapByPhones(phones);
     }
+
+    @GetMapping("/app/unauth/user_info/{code}")
+    @IgnoreUserToken
+    @IgnoreClientToken
+    public ObjectRestResponse<AppUserInfoVo> findUserInfoByCode(@PathVariable("code") String code){
+         AppUserInfoVo appUserInfoVo = userDetailBiz.findUserInfoByCode(code);
+         return ObjectRestResponse.succ(appUserInfoVo);
+    }
 }

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -70,11 +70,21 @@
         m.crt_time as timeOfMembership,
         m.recent_recharge as  recentRecharge,
         m.name as memberName,
-        ul.username as inviter
+        ul.username as inviter,
+        aup.name as `positionName`
         from
         app_user_login l
-        left join
-        app_user_detail d
+        inner join
+        (select * from app_user_detail where 1=1 <if test="postionState != null">
+           <choose>
+               <when test="postionState == 0">
+                 and  `position_id`=#{postionState}
+               </when>
+               <otherwise>
+                  and <![CDATA[`position_id`<>#{postionState}]]>
+               </otherwise>
+           </choose>
+    </if>) d
         on
         d.userid = l.id
         left  join
@@ -95,6 +105,9 @@
         ) m
         on
         l.id = m.user_id
+        left join
+        `app_user_position` as aup
+        on d.position_id= aup.level
         where l.isdel = 0
         <if test="mobile !=null and mobile !='' ">
             and l.username like  CONCAT('%',#{mobile},'%')
@@ -119,7 +132,6 @@
             and d.source = #{source}
         </if>
         order by  l.id  ASC
-
     </select>
 
 <update id="updateUserMemberStatusByUserId">

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/BuyVehicleForm.java

@@ -89,4 +89,10 @@ public class BuyVehicleForm implements Serializable {
 	@Column(name = "user_id")
 	@ApiModelProperty(value = "用户id")
 	private Integer userId;
+
+	/**
+	 * 0未处理 1已处理
+	 */
+	@Column(name = "status")
+	private Integer status;
 }

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/vo/BuyVehicleFormPageVo.java

+package com.xxfc.platform.app.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/8/9 15:36
+ */
+@Data
+public class BuyVehicleFormPageVo {
+    /**
+     *  主键
+     */
+    @ApiModelProperty("主键")
+    private Integer id;
+
+    /**
+     *  创建时间
+     */
+    @ApiModelProperty(value = "创建时间", hidden = true )
+    private Long crtTime;
+
+    /**
+     *  车型id
+     */
+    @ApiModelProperty(value = "车型id")
+    private Integer modelId;
+
+    /**
+     *  联系人名称
+     */
+    @ApiModelProperty(value = "联系人名称")
+    private String contactName;
+
+    /**
+     *  联系人电话
+     */
+    @ApiModelProperty(value = "联系人电话")
+    private String contactPhone;
+
+    /**
+     *  预约时间
+     */
+    @ApiModelProperty(value = "预约时间")
+    private Long bookTime;
+
+    /**
+     *  公司
+     */
+    @ApiModelProperty(value = "公司")
+    private String companyName;
+
+    /**
+     * 0未处理 1已处理
+     */
+    private Integer status;
+
+    /**
+     * 申请人
+     */
+    private String applyName;
+
+    /**
+     * 申请人电话
+     */
+    private String applyPhone;
+
+}
+

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BuyVehicleFormBiz.java

 package com.xxfc.platform.app.biz;
 
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.app.entity.dto.BuyVehicleFormFindDTO;
+import com.xxfc.platform.app.entity.vo.BuyVehicleFormPageVo;
+import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.app.entity.BuyVehicleForm;
 import com.xxfc.platform.app.mapper.BuyVehicleFormMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * 购房车提交表单
  *
@@ -14,5 +27,51 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  * @date 2019-07-09 19:39:47
  */
 @Service
-public class BuyVehicleFormBiz extends BaseBiz<BuyVehicleFormMapper,BuyVehicleForm> {
+public class BuyVehicleFormBiz extends BaseBiz<BuyVehicleFormMapper, BuyVehicleForm> {
+
+    @Autowired
+    private VehicleFeign vehicleFeign;
+
+    public PageDataVO<BuyVehicleFormPageVo> findBuyVehicleFormWithPage(BuyVehicleFormFindDTO buyVehicleFormFindDTO) {
+         PageDataVO<BuyVehicleFormPageVo> buyVehicleFormPage = new PageDataVO<>();
+        List<Integer> cpyIds = new ArrayList<>();
+        if(Objects.nonNull(buyVehicleFormFindDTO.getAreaId())){
+            List<Integer> companyIds = vehicleFeign.findCompanyIdsByAreaId(buyVehicleFormFindDTO.getAreaId());
+            if (Objects.isNull(buyVehicleFormFindDTO.getCompanyId())){
+                cpyIds.addAll(companyIds);
+            }else {
+                boolean flag = companyIds.contains(buyVehicleFormFindDTO.getCompanyId());
+                if (flag){
+                    cpyIds.add(buyVehicleFormFindDTO.getCompanyId());
+                }
+            }
+        }else {
+            if (Objects.nonNull(buyVehicleFormFindDTO.getCompanyId())){
+                cpyIds.add(buyVehicleFormFindDTO.getCompanyId());
+            }
+        }
+        PageDataVO<BuyVehicleForm> pageDataVO = PageDataVO.pageInfo(buyVehicleFormFindDTO.getPage(),buyVehicleFormFindDTO.getLimit(),()->mapper.findBuyVehicleForms(buyVehicleFormFindDTO, cpyIds));
+
+        List<BuyVehicleForm> data = pageDataVO.getData();
+        if (CollectionUtils.isEmpty(data)){
+            return buyVehicleFormPage;
+        }
+
+        List<Integer> userIds = data.stream().map(BuyVehicleForm::getUserId).collect(Collectors.toList());
+
+        List<BuyVehicleFormPageVo> buyVehicleFormPageVoList = new ArrayList<>();
+        BuyVehicleFormPageVo buyVehicleFormPageVo;
+        for (BuyVehicleForm buyVehicleForm : data) {
+             buyVehicleFormPageVo = new BuyVehicleFormPageVo();
+            BeanUtils.copyProperties(buyVehicleForm,buyVehicleFormPageVo);
+            buyVehicleFormPageVoList.add(buyVehicleFormPageVo);
+        }
+
+        buyVehicleFormPage.setData(buyVehicleFormPageVoList);
+        buyVehicleFormPage.setPageSize(pageDataVO.getPageSize());
+        buyVehicleFormPage.setPageNum(pageDataVO.getPageNum());
+        buyVehicleFormPage.setTotalPage(pageDataVO.getTotalPage());
+        buyVehicleFormPage.setTotalCount(pageDataVO.getTotalCount());
+        return buyVehicleFormPage;
+    }
 }
\ No newline at end of file

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/mapper/BuyVehicleFormMapper.java

 package com.xxfc.platform.app.mapper;
 
 import com.xxfc.platform.app.entity.BuyVehicleForm;
+import com.xxfc.platform.app.entity.dto.BuyVehicleFormFindDTO;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 /**
  * 购房车提交表单
  * 
@@ -12,4 +16,5 @@ import tk.mybatis.mapper.common.Mapper;
  */
 public interface BuyVehicleFormMapper extends Mapper<BuyVehicleForm> {
 
+    List<BuyVehicleForm> findBuyVehicleForms(@Param("bvf") BuyVehicleFormFindDTO buyVehicleFormFindDTO,@Param("companyIds") List<Integer> companyIds);
 }

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/admin/BuyVehicleFormAdminController.java

 package com.xxfc.platform.app.rest.admin;
 
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.app.biz.BuyVehicleFormBiz;
+import com.xxfc.platform.app.entity.dto.BuyVehicleFormFindDTO;
+import com.xxfc.platform.app.entity.vo.BuyVehicleFormPageVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -11,8 +18,20 @@ import org.springframework.web.bind.annotation.RestController;
  * @data 2019/8/9 13:55
  */
 @RestController
+@RequestMapping("buy_vehicle")
 public class BuyVehicleFormAdminController {
 
      @Autowired
      private BuyVehicleFormBiz vehicleFormBiz;
+
+     @PostMapping("/page")
+     public ObjectRestResponse<BuyVehicleFormPageVo> findBuyVehicleFormWithPage(BuyVehicleFormFindDTO buyVehicleFormFindDTO){
+          PageDataVO<BuyVehicleFormPageVo> pageDataVO = vehicleFormBiz.findBuyVehicleFormWithPage(buyVehicleFormFindDTO);
+          return ObjectRestResponse.succ(pageDataVO);
+     }
+
+     @PostMapping("/status/id")
+     public ObjectRestResponse<Void> processApplyById(@PathVariable("id") Integer id){
+
+     }
 }

xx-app/xx-app-server/src/main/resources/mapper/BuyVehicleFormMapper.xml

@@ -8,13 +8,34 @@
         <result property="id" column="id"/>
         <result property="crtTime" column="crt_time"/>
         <result property="updTime" column="upd_time"/>
-        <result property="name" column="name"/>
         <result property="modelId" column="model_id"/>
         <result property="contactName" column="contact_name"/>
         <result property="contactPhone" column="contact_phone"/>
         <result property="bookTime" column="book_time"/>
         <result property="companyId" column="company_id"/>
         <result property="remark" column="remark"/>
+        <result property="status" column="status"/>
     </resultMap>
 
+
+    <select id="findBuyVehicleForms" resultMap="buyVehicleFormMap">
+        select * from `buy_vehicle_form` where 1=1
+        <if test="bvf.startTime != null and bvf.endTime !=null">
+            and `bookTime` between #{bvf.startTime} and #{bvf.endTime}
+        </if>
+        <if test="bvf.startTime != null and bvf.endTime == null">
+            and `bookTime`>= #{bvf.startTime}
+        </if>
+        <if test="bvf.endTime != null and bvf.startTime == null">
+            and  <![CDATA[ `bookTime`<= #{bvf.endTime}]]>
+        </if>
+        <if test="bvf.areaId != null || bvf.companyId !=null">
+            <if test="companyIds != null and companyIds.size() != 0">
+                and `company_id` in
+                <foreach collection="companyIds" item="companyId" separator=",">
+                    #{companyId}
+                </foreach>
+            </if>
+        </if>
+    </select>
 </mapper>
\ No newline at end of file

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopDetailDTO.java

@@ -68,4 +68,9 @@ public class CampsiteShopDetailDTO {
     @ApiModelProperty(value = "电话")
     private String phone;
 
+    /**
+     * 店铺logo
+     */
+    private String logo;
+
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteShopDetailVo.java

@@ -92,4 +92,9 @@ public class CampsiteShopDetailVo {
 
     @ApiModelProperty(value = "電話")
     private String phone;
+
+    /**
+     * 店铺logo
+     */
+    private  String logo;
 }

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -58,7 +58,7 @@
 
     <!--根据id查询详情-->
     <select id="findCampsiteShopDetailById" resultType="com.xxfc.platform.campsite.dto.CampsiteShopDetailDTO">
-        select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,
+        select `name` as `name`,`province_name` as `provinceName`,`city_name` as `cityName`,`address` as `address`,`service_phone` as `phone`,`logo` as `logo`,
         `content` as `content`,`configure` as `configure`,`longitude` as `longitude`,`latitude` as `latitude` from `campsite_shop` where `id`=#{id}
     </select>
 

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGood.java

@@ -134,5 +134,4 @@ public class TourGood implements Serializable {
 	@Column(name = "poster_background")
 	@ApiModelProperty(value = "海报背景")
 	private String posterBackground;
-
 }

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

@@ -128,7 +128,7 @@ public class TourGoodDetailVo {
 	@ApiModelProperty(value = "商品标签")
 	List<GoodTagDTO> tagDTOS;
 
-
+   private String posterBackground;
 	
 
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -16,7 +16,7 @@ import java.util.Set;
 /**
  * Created by ace on 2017/9/15.
  */
-@FeignClient(name = "vehicle")
+@FeignClient(name = "vehicle",contextId = "vh")
 public interface VehicleFeign {
     @GetMapping(value = "/vehicleModel/{id}")
     public ObjectRestResponse<VehicleModel> get(@PathVariable(value = "id") int id);
@@ -116,4 +116,7 @@ public interface VehicleFeign {
 
     @GetMapping("/accompanyingItem/app/unauth/items")
     public RestResponse<List<AccompanyingItemVo>> listAccompanyingItem();
+
+    @GetMapping("/findByAreaId")
+    List<Integer> findCompanyIdsByAreaId(@RequestParam(value = "areaId") Integer areaId);
 }

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

@@ -327,4 +327,8 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
 
 
     }
+
+    public List<Integer> selectCompanyIdsByAreaId(Integer areaId) {
+        return mapper.findCompanyIdsByAreaId(areaId);
+    }
 }

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

@@ -10,4 +10,6 @@ import java.util.Map;
 public interface BranchCompanyMapper extends Mapper<BranchCompany> {
     List<BranchCompany> search(@Param("lon") String lon, @Param("lat") String lat, @Param("addrCity") Integer addrCity);
     List<BranchCompany> selectByZoneId(Map<String, Object> param);
+
+    List<Integer> findCompanyIdsByAreaId(@Param("areaId") Integer areaId);
 }
\ No newline at end of file

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

@@ -164,4 +164,9 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
         //查询列表数据
         return ObjectRestResponse.succ(baseBiz.selectList(entity));
     }
+
+    @GetMapping("/findByAreaId")
+    public List<Integer> findCompanyIdsByAreaId(@RequestParam(value = "areaId") Integer areaId){
+        return baseBiz.selectCompanyIdsByAreaId(areaId);
+    }
 }

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

@@ -19,6 +19,7 @@
       <result column="tour_service_phone" property="tourServicePhone"/>
       <result column="longitude" property="longitude"/>
       <result column="latitude" property="latitude"/>
+      <result column="zone_id" property="zoneId"/>
   </resultMap>
 
   <select id="search" resultType="com.xxfc.platform.vehicle.pojo.CompanySearchVO">
@@ -49,4 +50,7 @@
             </foreach>
         </if>
     </select>
+   <select id="findCompanyIdsByAreaId" resultType="integer">
+       select `id` from `branch_company` where `zone_id`=#{areaId}
+   </select>
 </mapper>
\ No newline at end of file