修改实名认证

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

@@ -92,6 +92,7 @@ public class AppUserVo {
 
 	@ApiModelProperty(value = "用户职位名称")
 	private String jobTitle;
+
 	@ApiModelProperty(value = "用户会员名称")
 	private String memberName;
 

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

@@ -60,26 +60,26 @@
   </select>
 
 
-    <!--  获取用户信息 -->
-    <select id="getUserVo" resultMap="AppUserVoMap">
-    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*,p.name  as jobTitle,buml.name as memberName  from app_user_login l
-    left join  app_user_detail d
-    on d.userid = l.id
-    left join base_user_member bum
-    on bum.user_id=l.id
-    left join  base_user_member_level buml
-    on bum.member_level = buml.level
-    left join   app_user_position  p
-    on d.position_id=p.id
-    where
-    p.is_del=0
-    and
-    buml.isdel=0
-    and
-    bum.is_del=0
-    and
-     d.userid = #{userId}  limit 1
-  </select>
+<!--    &lt;!&ndash;  获取用户信息 &ndash;&gt;-->
+<!--    <select id="getUserVo" resultMap="AppUserVoMap">-->
+<!--    select l.im_userid,l.username,l.wx_openid,l.unionid,l.openid,l.status,l.id_number,l.certification_status,d.*,p.name  as jobTitle,buml.name as memberName  from app_user_login l-->
+<!--    left join  app_user_detail d-->
+<!--    on d.userid = l.id-->
+<!--    left join base_user_member bum-->
+<!--    on bum.user_id=l.id-->
+<!--    left join  base_user_member_level buml-->
+<!--    on bum.member_level = buml.level-->
+<!--    left join   app_user_position  p-->
+<!--    on d.position_id=p.id-->
+<!--    where-->
+<!--    p.is_del=0-->
+<!--    and-->
+<!--    buml.isdel=0-->
+<!--    and-->
+<!--    bum.is_del=0-->
+<!--    and-->
+<!--     d.userid = #{userId}  limit 1-->
+<!--  </select>-->
 
 
     <select id="getUserIdByUsername" resultType="java.lang.Integer" parameterType="java.lang.String">

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderListVo.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.pojo.order;
 
 import com.xxfc.platform.order.entity.*;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -45,6 +46,11 @@ public class OrderListVo extends BaseOrder {
     private List<OrderItem> items;
 
 
+    @ApiModelProperty(value = "用户职位名称")
+    private String jobTitle;
+
+    @ApiModelProperty(value = "用户会员名称")
+    private String memberName;
 
 
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -172,6 +172,8 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     orderPageVO.setTelephone(appUserVo.getUsername());
                     orderPageVO.setUsername(appUserVo.getNickname());
                     orderPageVO.setRealName(appUserVo.getRealname());
+                    orderPageVO.setJobTitle(appUserVo.getJobTitle());
+                    orderPageVO.setMemberName(appUserVo.getMemberName());
                 }
                 if (orderPageVO.getOrderRentVehicleDetail() != null && orderPageVO.getOrderRentVehicleDetail().getVehicleId() != null) {
                     RestResponse<Vehicle> restResponse = vehicleFeign.findById(orderPageVO.getOrderRentVehicleDetail().getVehicleId());