修改出游人信息和用户管理

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

@@ -54,15 +54,16 @@ public class AppUserManageVo {
     /**
      * 邀请人id
      */
-    @Column(name = "Inviter_account")
-    private Integer InviterAccount;
-
+    @Column(name = "inviter_account")
+    private Integer inviterAccount;
     /**
-     * 账号申请所在地
+     * 上
      */
-    @Column(name = "address")
-    private String address;
+    @Column(name = "province_code")
+    private String provinceCode;
 
+    @Column(name = "city_code")
+    private String cityCode;
     /**
      * 用户性别
      */

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="im_userid" property="imUserid" />
-    <result column="username" property="username" />
-    <result column="wx_openid"  property="wxOpenid" />
-    <result column="unionid"  property="unionid" />
-    <result column="openid"  property="openid" />
-    <result column="status"  property="status" />
-    <result column="id_number"  property="idNumber" />
-    <result column="certification_status"  property="certificationStatus" />
-    <result column="is_member"  property="isMember" />
-    <result column="nickname"  property="nickname" />
-    <result column="realname"  property="realname" />
-    <result column="headimgurl"  property="headimgurl" />
-    <result column="birthday"  property="birthday" />
-    <result column="email"  property="email" />
-    <result column="sex"  property="sex" />
-    <result column="person_sign"  property="personSign" />
-    <result column="remark" property="remark" />
-    <result column="channel" property="channel" />
-    <result column="province_code" property="provinceCode" />
-    <result column="city_code" property="cityCode" />
-    <result column="crt_host" property="crtHost" />
-    <result column="upd_host" property="updHost" />
-    <result column="position_id" property="positionId" />
-    <result column="source" property="source" />
-    <result column="code" property="code" />
-    <result column="invitera_ccount" property="inviterAccount" />
-  </resultMap>
+    <resultMap id="AppUserVoMap" type="com.github.wxiaoqi.security.admin.vo.AppUserVo">
+        <result column="id" property="id"/>
+        <result column="userid" property="userid"/>
+        <result column="im_userid" property="imUserid"/>
+        <result column="username" property="username"/>
+        <result column="wx_openid" property="wxOpenid"/>
+        <result column="unionid" property="unionid"/>
+        <result column="openid" property="openid"/>
+        <result column="status" property="status"/>
+        <result column="id_number" property="idNumber"/>
+        <result column="certification_status" property="certificationStatus"/>
+        <result column="is_member" property="isMember"/>
+        <result column="nickname" property="nickname"/>
+        <result column="realname" property="realname"/>
+        <result column="headimgurl" property="headimgurl"/>
+        <result column="birthday" property="birthday"/>
+        <result column="email" property="email"/>
+        <result column="sex" property="sex"/>
+        <result column="person_sign" property="personSign"/>
+        <result column="remark" property="remark"/>
+        <result column="channel" property="channel"/>
+        <result column="province_code" property="provinceCode"/>
+        <result column="city_code" property="cityCode"/>
+        <result column="crt_host" property="crtHost"/>
+        <result column="upd_host" property="updHost"/>
+        <result column="position_id" property="positionId"/>
+        <result column="source" property="source"/>
+        <result column="code" property="code"/>
+        <result column="invitera_ccount" property="inviterAccount"/>
+    </resultMap>
 
 
-  <!--  获取用户信息 -->
-  <select id="getUserInfo" resultMap="AppUserVoMap">
+    <!--  获取用户信息 -->
+    <select id="getUserInfo" resultMap="AppUserVoMap">
     select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*  from app_user_login l
     left join  app_user_detail d
     on d.userid = l.id
@@ -52,7 +52,8 @@
         d.nickname,
         d.source,
         d.Inviter_account,
-        d.address,
+        d.province_code,
+        d.city_code,
         d.sex,
         d.email,
         l.username,
@@ -84,7 +85,7 @@
         base_user_member_level ml
         on
         ml.id = b.member_level
-        )  m
+        ) m
         on
         l.id = m.user_id
         where 1=1
@@ -106,7 +107,7 @@
         </if>
 
 
-  </select>
+    </select>
 
 
 </mapper>
\ No newline at end of file

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

@@ -11,6 +11,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
@@ -93,14 +94,14 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
     }
 
     /**
-     * 添加和更新
-     * @param id
+     * 删除
+     * @param
      * @return
      */
 
     @ApiOperation("删除")
     @PostMapping(value = "/app/del")
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public ObjectRestResponse<TourUser> del(@RequestBody TourUser tourUser){
         try {
 
@@ -148,4 +149,28 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
     }
 
 
+
+    /**
+     * 删除
+     * @param
+     * @return
+     */
+
+    @ApiOperation("删除")
+    @PostMapping(value = "/app/del/{id}")
+    @Transactional(rollbackFor = Exception.class)
+    public ObjectRestResponse<TourUser> del(@PathVariable Integer id){
+        try {
+            TourUser tourUser= new TourUser();
+            tourUser.setIsdel(1);
+            baseBiz.updateSelectiveById(tourUser);
+            return ObjectRestResponse.succ();
+        } catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+           return ObjectRestResponse.createDefaultFail();
+        }
+    }
+
+
 }
\ No newline at end of file