Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/PageParam.java

@@ -8,5 +8,5 @@ public class PageParam {
     @ApiModelProperty("当前页码")
     Integer page;
     @ApiModelProperty("每页限制")
-    Integer limit;
+        Integer limit;
 }

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

@@ -18,6 +18,7 @@ public class AppUserLogin {
 	private int id;
 	@Column(name = "im_userid")
 	private Integer imUserid;
+	@Column(name = "username")
 	private String username;
 	private String password;
 	@Column(name = "wx_openid")

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

+package com.github.wxiaoqi.security.admin.vo;
+
+import lombok.Data;
+
+/**
+ * 用户信息表
+ */
+@Data
+public class AppUserVo {
+
+
+	private Integer id;
+	 //用户id
+	private Integer userid;
+	//imid
+	private Integer imUserid;
+	///账号（手机号）
+	private String username;
+	//微信openid
+	private String wxOpenid;
+	//微信unionid
+	private String unionid;
+	//qq
+	private String openid;
+	//状态：0-启用，1-禁用
+	private Integer status;
+	//身份证号
+	private String idNumber;
+	//实名认证状态:0-未认证，1-已认证
+	private Integer certificationStatus;
+	//会员
+	private Integer isMember;
+	//昵称
+	private String nickname;
+	//真实姓名
+	private String realname;
+	//头像
+	private String headimgurl;
+	//邮箱
+	private String email;
+   //性别 0-女，1-男
+	private Integer sex;
+	//生日
+	private String birthday;
+	//个性签名
+	private String personSign;
+	//备注
+	private String remark;
+
+}

ace-modules/ace-admin/pom.xml

@@ -86,6 +86,11 @@
             <artifactId>fastjson</artifactId>
             <version>1.1.37</version>
         </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.3</version>
+        </dependency>
         <!--用于测试的，本例可省略-->
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -4,11 +4,14 @@ import com.ace.cache.annotation.Cache;
 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.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
 /**
@@ -21,6 +24,7 @@ import java.util.List;
 @Transactional(rollbackFor = Exception.class)
 public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail> {
 
+
     @Override
     @CacheClear(pre="user{1.userid}")
     public void updateSelectiveById(AppUserDetail entity) {
@@ -33,7 +37,7 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
      * @return
      */
     @Cache(key="user{1}")
-    public AppUserDetail getUserByUserid(Integer userid){
+    public AppUserDetail getUserByUserid(Integer userid) {
         Example example = new Example(AppUserDetail.class);
         example.createCriteria().andEqualTo("userid", userid).andEqualTo("isdel", 0);
         List<AppUserDetail> list = mapper.selectByExample(example);
@@ -44,6 +48,28 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
     }
 
 
+    public AppUserVo getUserInfoById(Integer userid){
+        return mapper.getUserInfo(userid);
+    }
+
+
+    @CacheClear(pre="user{1.userid}")
+    public void updUuserInfoById(AppUserVo userVo){
+        AppUserDetail entity =new  AppUserDetail();
+        try {
+            BeanUtils.copyProperties(entity,userVo);
+            if(entity!=null){
+                super.updateSelectiveById(entity);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
+
+
+
+
 
 
 

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java

 package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.github.wxiaoqi.security.admin.vo.AppUserVo;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 public interface AppUserDetailMapper extends Mapper<AppUserDetail> {
 
+    //查询用户信息
+    public AppUserVo getUserInfo(@Param("userId") Integer userId);
+
 
 }
\ No newline at end of file

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

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.AppUserBiz;
+import com.github.wxiaoqi.security.admin.biz.AppUserDetailBiz;
 import com.github.wxiaoqi.security.admin.entity.AppUser;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.Group;
 import com.github.wxiaoqi.security.admin.entity.User;
 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.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
 import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -35,6 +40,9 @@ public class AppUserController extends CommonBaseController {
     @Autowired
     private UserAuthConfig userAuthConfig;
 
+    @Autowired
+    AppUserDetailBiz userDetailBiz;
+
     @GetMapping("page")
     public TableResultResponse list(@RequestParam Map<String, Object> params) {
         Query query = new Query(params);
@@ -86,4 +94,39 @@ public class AppUserController extends CommonBaseController {
         return new ObjectRestResponse();
     }
 
+    /**
+     * 获取用户信息
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/info")
+    public ObjectRestResponse<AppUserVo> getUserInfo()throws Exception {
+        String username = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId();
+        if (username == null) {
+            throw new Exception();
+        }
+        Integer userid=Integer.parseInt(username);
+        AppUserVo user = userDetailBiz.getUserInfoById(userid);
+        if (user == null) {
+            throw new Exception();
+        }
+        return ObjectRestResponse.succ(user);
+    }
+
+    /**
+     * 更新用户信息
+     * @param userVo
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/edit")
+    public ObjectRestResponse edit(@RequestBody AppUserVo userVo)throws Exception {
+        if(userVo==null||userVo.getId()==null){
+            return   ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
+        }
+        userDetailBiz.updUuserInfoById(userVo);
+        return ObjectRestResponse.succ();
+    }
+
+
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.github.wxiaoqi.security.admin.mapper.AppUserDetailMapper">
+  <resultMap id="AppUserVoMap" type="com.github.wxiaoqi.security.admin.vo.AppUserVo">
+    <result column="id" property="id" />
+    <result column="userid" property="userid" />
+    <result column="username" property="username" />
+    <result column="wxOpenid"  property="wx_openid" />
+    <result column="unionid"  property="unionid" />
+    <result column="openid"  property="openid" />
+    <result column="status"  property="status" />
+    <result column="idNumber"  property="id_number" />
+    <result column="certificationStatus"  property="certification_status" />
+    <result column="isMember"  property="is_member" />
+    <result column="nickname"  property="nickname" />
+    <result column="realname"  property="realname" />
+    <result column="headimgurl"  property="headimgurl" />
+    <result column="isMember"  property="is_member" />
+    <result column="birthday"  property="birthday" />
+    <result column="email"  property="email" />
+    <result column="sex"  property="sex" />
+    <result column="personSign"  property="person_sign" />
+    <result column="remark" property="remark" />
+  </resultMap>
+
+
+  <!--  获取用户信息 -->
+  <select id="getUserInfo" resultMap="AppUserVoMap">
+    select *  from app_user_login l
+    left join  app_user_detail d
+    on d.userid = l.id where d.userid = #{userId}  limit 1
+  </select>
+</mapper>
\ No newline at end of file

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/dto/GoodTagDTO.java

@@ -20,6 +20,9 @@ public class GoodTagDTO {
 	//标签id
 	@ApiModelProperty(value = "标签id")
     private Integer tagId;
+
+	@ApiModelProperty(value = "标签name")
+	private String name;
 	
 
 }

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

@@ -33,6 +33,30 @@ public class TourDepartVo {
 	@ApiModelProperty(value = "分公司id")
 	private String companyId;
 
+	/**
+	 * 地址-省/直辖市(编码)
+	 */
+	@ApiModelProperty("地址-省/直辖市(编码)")
+	private Integer province;
+
+	/**
+	 * 地址-省/直辖市(名称)
+	 */
+	@ApiModelProperty("地址-省/直辖市(名称)")
+	private Integer provinceName;
+
+	/**
+	 * 地址-市(编码)
+	 */
+	@ApiModelProperty("地址-市(编码)")
+	private Integer city;
+
+	/**
+	 * 地址-市(名称)
+	 */
+	@ApiModelProperty("地址-市(名称)")
+	private Integer cityName;
+
 
 	//出发时间
 	@ApiModelProperty(value = "出发时间")

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

@@ -5,6 +5,7 @@ import java.math.BigDecimal;
 import java.util.List;
 
 import com.alibaba.fastjson.JSONObject;
+import com.xxfc.platform.tour.dto.GoodTagDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -110,6 +111,10 @@ public class TourGoodDetailVo {
 	@ApiModelProperty(value = "目的地")
 	private String destination;
 
+	//商品标签
+	@ApiModelProperty(value = "商品标签")
+	List<GoodTagDTO> tagDTOS;
+
 
 	
 

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

@@ -195,8 +195,10 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
             e.printStackTrace();
             return   ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
         }
-        return ObjectRestResponse.succ(good);
+        return ObjectRestResponse.succ();
     }
+
+
 }
 
 

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

@@ -4,10 +4,12 @@ import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.tour.dto.GoodTagDTO;
 import com.xxfc.platform.tour.entity.TourGood;
 import com.xxfc.platform.tour.mapper.TourGoodMapper;
 import com.xxfc.platform.tour.mapper.TourGoodSiteMapper;
 import com.xxfc.platform.tour.mapper.TourGoodSpePriceMapper;
+import com.xxfc.platform.tour.mapper.TourGoodTagMapper;
 import com.xxfc.platform.tour.vo.TourDepartTimeVo;
 import com.xxfc.platform.tour.vo.TourDepartVo;
 import com.xxfc.platform.tour.vo.TourGoodDetailVo;
@@ -16,8 +18,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.xxfc.platform.tour.entity.TourGoodSpePrice;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 
 import java.math.BigDecimal;
@@ -42,6 +42,8 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
     @Autowired
     TourGoodSiteMapper siteMapper;
     @Autowired
+    TourGoodTagMapper tagMapper;
+    @Autowired
     private UserFeign userFeign;
 
     //获取商品详情
@@ -73,12 +75,42 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
 
                 }
                 //获取出行时间
+                List<TourDepartTimeVo> timelist=priceMapper.getAllByGoodId(id);
+                detailVo.setTourDepartTimeVo(timelist);
+                //获取出发地点
+                List<TourDepartVo> departList=siteMapper.getlistByGoodId(id);
+                detailVo.setTourDepartVo(departList);
+                return   ObjectRestResponse.succ(detailVo);
+            }
+            return   ObjectRestResponse.createDefaultFail();
+        }catch (Exception e) {
+            e.printStackTrace();
+            log.error("---商品详情---id====="+id+"----异常---msg==="+ e.getMessage());
+            return   ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
+        }
+    }
 
+
+    //获取商品详情
+    public ObjectRestResponse<TourGoodDetailVo> findDetaileById(Integer id){
+        if(id==null||id==0){
+            return   ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
+        }
+        try {
+            TourGood TourGood = mapper.getOne(id);
+            if (TourGood != null) {
+                TourGoodDetailVo detailVo = new TourGoodDetailVo();
+                BeanUtils.copyProperties(detailVo, TourGood);
+                BigDecimal price=detailVo.getPrice();
+                //获取出行时间
                 List<TourDepartTimeVo> timelist=priceMapper.getAllByGoodId(id);
                 detailVo.setTourDepartTimeVo(timelist);
                 //获取出发地点
                 List<TourDepartVo> departList=siteMapper.getlistByGoodId(id);
                 detailVo.setTourDepartVo(departList);
+                //获取标签
+                List<GoodTagDTO> tagList=tagMapper.getGoodTagList(id);
+                detailVo.setTagDTOS(tagList);
                 return   ObjectRestResponse.succ(detailVo);
             }
             return   ObjectRestResponse.createDefaultFail();
@@ -88,7 +120,7 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
             return   ObjectRestResponse.createFailedResult(ResultCode.EXCEPTION_CODE, "出现异常");
         }
     }
-    
+
 
 
 

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

 package com.xxfc.platform.tour.mapper;
 
+import com.xxfc.platform.tour.dto.GoodTagDTO;
 import com.xxfc.platform.tour.entity.TourGoodTag;
+import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 /**
  * 商品标签表
  * 
@@ -11,5 +15,11 @@ import tk.mybatis.mapper.common.Mapper;
  * @date 2019-06-06 11:41:51
  */
 public interface TourGoodTagMapper extends Mapper<TourGoodTag> {
+
+
+    //查询旅游标签
+    public List<GoodTagDTO> getGoodTagList(@Param("goodId") Integer goodId);
+
+
 	
 }

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

@@ -4,10 +4,13 @@ import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.tour.biz.TourGoodBiz;
+import com.xxfc.platform.tour.biz.TourGoodDetailBiz;
 import com.xxfc.platform.tour.dto.GoodSearchDTO;
 import com.xxfc.platform.tour.dto.TourGoodDTO;
 import com.xxfc.platform.tour.entity.TourGood;
+import com.xxfc.platform.tour.vo.TourGoodDetailVo;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
@@ -15,16 +18,25 @@ import org.springframework.web.bind.annotation.*;
 @IgnoreClientToken
 public class TourGoodAdminController extends BaseController<TourGoodBiz, TourGood> {
 
+    @Autowired
+    TourGoodDetailBiz detailBiz;
+
     @ApiOperation("后台查询旅游路线列表")
-    @RequestMapping(value = "/admin/goodList", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/goodList", method = RequestMethod.POST)
     public ObjectRestResponse<TourGood> goodList(@RequestBody GoodSearchDTO dto) {
         return ObjectRestResponse.succ(baseBiz.getAll(dto));
     }
 
-    @ApiOperation("后台查询旅游路线列表")
-    @RequestMapping(value = "/admin/goodEdit", method = RequestMethod.GET)
+    @ApiOperation("后台查询旅游更新")
+    @RequestMapping(value = "/admin/goodEdit", method = RequestMethod.POST)
     public ObjectRestResponse<TourGood> goodEdit(@RequestBody TourGoodDTO dto) {
-        return ObjectRestResponse.succ(baseBiz.goodsEdit(dto));
+        return baseBiz.goodsEdit(dto);
+    }
+
+    @ApiOperation("后台查询旅游路线")
+    @RequestMapping(value = "/admin/goodOne", method = RequestMethod.GET)
+    public ObjectRestResponse<TourGoodDetailVo> goodEdit(@RequestParam(value = "id",defaultValue = "0")Integer id) {
+        return detailBiz.findDetaileById(id);
     }
 
 

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodMapper.xml

@@ -80,13 +80,13 @@
 </select>
 
     <!--后台查询旅游路线列表-->
-    <select id="findGoodList" resultMap="tourGoodMap">
+    <select id="findGoodList" resultMap="tourGoodVoMap">
         SELECT g.*,REPLACE(GROUP_CONCAT( DISTINCT t.`name`),',','|')as tagNames  from tour_good g
         LEFT JOIN tour_good_tag tag ON g.id=tag.good_id
         LEFT JOIN tour_tag t ON tag.tag_id=t.id
         <where>
-        <if test="params.query != null and params.query != ''">
-            and (g.`name` like CONCAT('%',#{params.query},'%') or g.introduce like CONCAT('%',#{params.query},'%'))
+        <if test="params.name != null and params.name != ''">
+            and (g.`name` like CONCAT('%',#{params.name},'%') or g.introduce like CONCAT('%',#{params.name},'%'))
         </if>
         <if test="params.tagId != null and params.tagId != '' ">
             and g.id in (SELECT good_id from tour_good_tag

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodSiteMapper.xml

@@ -26,6 +26,10 @@
         <result property="name" column="name"/>
         <result property="address" column="address"/>
         <result property="companyId" column="company_id"/>
+        <result property="province" column="province"/>
+        <result property="provinceName" column="province_name"/>
+        <result property="city" column="city"/>
+        <result property="cityName" column="city_name"/>
         <result property="departTime" column="depart_time"/>
         <result property="longitude" column="longitude"/>
         <result property="latitude" column="latitude"/>

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodSpePriceMapper.xml

@@ -36,7 +36,7 @@
 
     <!-- 获取出行时间 -->
     <select id="getAllByGoodId"  resultMap="tourDepartTimeVoMap">
-        SELECT id,good_id,good_id,DATE_FORMAT(start_time,'%Y-%m-%d') as start_time,DATE_FORMAT(end_time,'%Y-%m-%d') as end_time,spe_id,price,child_price,member_price,stock,
+        SELECT id,good_id,DATE_FORMAT(start_time,'%Y-%m-%d') as start_time,DATE_FORMAT(end_time,'%Y-%m-%d') as end_time,spe_id,price,child_price,member_price,stock,
         DATE_FORMAT(start_time,'%w') as startWeek,DATE_FORMAT(end_time,'%w') as endWeek,IF(IFNULL(DATEDIFF(start_time,NOW()),0)>0,'0','1') as overdue
         FROM tour_good_spe_price WHERE good_id=#{goodId} and is_del=0 ORDER BY start_time
     </select>

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodTagMapper.xml

@@ -13,4 +13,17 @@
         <result property="isDel" column="is_del"/>
     </resultMap>
 
+    <resultMap type="com.xxfc.platform.tour.dto.GoodTagDTO" id="GoodTagDTOMap">
+        <result property="id" column="id"/>
+        <result property="tagId" column="tag_id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+
+    <select id="getGoodTagList"  resultMap="GoodTagDTOMap">
+       select tag.id,tag.tag_id,t.`name` FROM tour_good g
+        LEFT JOIN tour_good_tag tag ON g.id=tag.good_id
+         LEFT JOIN tour_tag t ON tag.tag_id=t.id
+        WHERE g.id=#{goodId} and tag.is_del=0
+  </select>
+
 </mapper>
\ No newline at end of file