新增: 航空公司商家表

api-app/src/main/java/com/jumeirah/api/app/controller/AirIntroducedController.java

 package com.jumeirah.api.app.controller;
 
-import com.jumeirah.common.param.MerchantUserPageParam;
+import com.jumeirah.common.param.MerchantPageParam;
+import com.jumeirah.common.service.MerchantService;
 import com.jumeirah.common.service.MerchantUserService;
-import com.jumeirah.common.vo.MerchantUserQueryForAppVo;
+import com.jumeirah.common.vo.MerchantQueryVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
@@ -33,14 +34,17 @@ public class AirIntroducedController extends BaseController {
     @Autowired
     private MerchantUserService merchantUserService;
 
+    @Autowired
+    private MerchantService merchantService;
+
     /**
      * 商家分页列表
      */
     @PostMapping("/getPageList")
     @OperationLog(name = "航空公司介绍分页列表", type = OperationLogType.PAGE)
-    @ApiOperation(value = "航空公司介绍分页列表", response = MerchantUserQueryForAppVo.class)
-    public ApiResult<Paging<MerchantUserQueryForAppVo>> getMerchantUserPageList(@Validated @RequestBody MerchantUserPageParam merchantUserPageParam) throws Exception {
-        Paging<MerchantUserQueryForAppVo> paging = merchantUserService.getMerchantUserPageListForApp(merchantUserPageParam);
+    @ApiOperation(value = "航空公司介绍分页列表", response = MerchantQueryVo.class)
+    public ApiResult<Paging<MerchantQueryVo>> getMerchantPageList(@Validated @RequestBody MerchantPageParam merchantPageParam) throws Exception {
+        Paging<MerchantQueryVo> paging = merchantService.getMerchantPageList(merchantPageParam);
         return ApiResult.ok(paging);
     }
 }

api-app/src/main/java/com/jumeirah/api/app/controller/MerchantController.java

+package com.jumeirah.api.app.controller;
+
+import com.jumeirah.common.entity.Merchant;
+import com.jumeirah.common.param.MerchantPageParam;
+import com.jumeirah.common.service.MerchantService;
+import com.jumeirah.common.vo.MerchantQueryVo;
+import io.geekidea.springbootplus.framework.common.api.ApiResult;
+import io.geekidea.springbootplus.framework.common.controller.BaseController;
+import io.geekidea.springbootplus.framework.core.pagination.Paging;
+import io.geekidea.springbootplus.framework.core.validator.groups.Add;
+import io.geekidea.springbootplus.framework.core.validator.groups.Update;
+import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
+import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 航空公司商家表 控制器
+ *
+ * @author giao
+ * @since 2020-10-13
+ */
+@Slf4j
+@RestController
+@RequestMapping("/app/merchant")
+@Api(value = "航空公司商家表API", tags = {"航空公司航空公司商家表"})
+public class MerchantController extends BaseController {
+
+    @Autowired
+    private MerchantService merchantService;
+
+    /**
+     * 添加航空公司商家表
+     */
+    @PostMapping("/add")
+    @OperationLog(name = "添加航空公司商家表", type = OperationLogType.ADD)
+    @ApiOperation(value = "添加航空公司商家表")
+    public ApiResult<Boolean> addMerchant(@Validated(Add.class) @RequestBody Merchant merchant) throws Exception {
+        boolean flag = merchantService.saveMerchant(merchant);
+        return ApiResult.result(flag);
+    }
+
+    /**
+     * 修改航空公司商家表
+     */
+    @PostMapping("/update")
+    @OperationLog(name = "修改航空公司商家表", type = OperationLogType.UPDATE)
+    @ApiOperation(value = "修改航空公司商家表")
+    public ApiResult<Boolean> updateMerchant(@Validated(Update.class) @RequestBody Merchant merchant) throws Exception {
+        boolean flag = merchantService.updateMerchant(merchant);
+        return ApiResult.result(flag);
+    }
+
+    /**
+     * 删除航空公司商家表
+     */
+    @PostMapping("/delete/{id}")
+    @OperationLog(name = "删除航空公司商家表", type = OperationLogType.DELETE)
+    @ApiOperation(value = "删除航空公司商家表")
+    public ApiResult<Boolean> deleteMerchant(@PathVariable("id") Long id) throws Exception {
+        boolean flag = merchantService.deleteMerchant(id);
+        return ApiResult.result(flag);
+    }
+
+    /**
+     * 获取航空公司商家表详情
+     */
+    @GetMapping("/info/{id}")
+    @OperationLog(name = "航空公司商家表详情", type = OperationLogType.INFO)
+    @ApiOperation(value = "航空公司商家表详情")
+    public ApiResult<MerchantQueryVo> getMerchant(@PathVariable("id") Long id) throws Exception {
+        MerchantQueryVo merchantQueryVo = merchantService.getMerchantById(id);
+        return ApiResult.ok(merchantQueryVo);
+    }
+
+    /**
+     * 航空公司商家表分页列表
+     */
+    @PostMapping("/getPageList")
+    @OperationLog(name = "航空公司商家表分页列表", type = OperationLogType.PAGE)
+    @ApiOperation(value = "航空公司商家表分页列表")
+    public ApiResult<Paging<MerchantQueryVo>> getMerchantPageList(@Validated @RequestBody MerchantPageParam merchantPageParam) throws Exception {
+        Paging<MerchantQueryVo> paging = merchantService.getMerchantPageList(merchantPageParam);
+        return ApiResult.ok(paging);
+    }
+
+}
+

common/src/main/java/com/jumeirah/common/entity/Merchant.java

+package com.jumeirah.common.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
+import io.geekidea.springbootplus.framework.core.validator.groups.Update;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * 航空公司商家表
+ *
+ * @author giao
+ * @since 2020-10-13
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "Merchant对象")
+public class Merchant extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @NotNull(message = "id不能为空", groups = {Update.class})
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("商家名称")
+    private String name;
+
+    @ApiModelProperty("联系人手机号码")
+    private String phone;
+
+    @ApiModelProperty("联系人手机区号")
+    private String phoneArea;
+
+    @ApiModelProperty("公司头像")
+    private String head;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("状态，0：禁用，1：启用，2：锁定")
+    private Integer state;
+
+    @ApiModelProperty("逻辑删除，0：未删除，1：已删除")
+    @TableLogic
+    private Integer deleted;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("商家开户银行")
+    private String rechargeBank;
+
+    @ApiModelProperty("商家开户名称")
+    private String rechargeName;
+
+    @ApiModelProperty("商家银行卡号")
+    private String rechargeBankNumber;
+
+    @ApiModelProperty("在列表展示的图片url")
+    private String imageListUrl;
+
+    @ApiModelProperty("公司介绍图片url")
+    private String imageCompanyIntroductionUrl;
+
+    @ApiModelProperty("团队介绍图片url")
+    private String imageTeamIntroductionUrl;
+
+    @ApiModelProperty("优势图片url")
+    private String imageAdvantageUrl;
+
+    @ApiModelProperty("公司介绍文字")
+    private String textCompanyIntroduction;
+
+    @ApiModelProperty("团队介绍文字")
+    private String textTeamIntroduction;
+
+    @ApiModelProperty("优势介绍文字")
+    private String textAdvantage;
+
+    @ApiModelProperty("航空公司名称")
+    private String airlineName;
+
+}

common/src/main/java/com/jumeirah/common/entity/MerchantUser.java

@@ -85,25 +85,4 @@ public class MerchantUser extends BaseEntity {
     @ApiModelProperty("修改时间")
     private Date updateTime;
 
-    @ApiModelProperty("在列表展示的图片url")
-    private String imageListUrl;
-
-    @ApiModelProperty("公司介绍图片url")
-    private String imageCompanyIntroductionUrl;
-
-    @ApiModelProperty("团队介绍图片url")
-    private String imageTeamIntroductionUrl;
-
-    @ApiModelProperty("优势图片url")
-    private String imageAdvantageUrl;
-
-    @ApiModelProperty("公司介绍文字")
-    private String textCompanyIntroduction;
-
-    @ApiModelProperty("团队介绍文字")
-    private String textTeamIntroduction;
-
-    @ApiModelProperty("优势介绍文字")
-    private String textAdvantage;
-
 }

common/src/main/java/com/jumeirah/common/entity/Stroke.java

@@ -171,16 +171,5 @@ public class Stroke extends BaseEntity {
     @ApiModelProperty("用户充值截图证据,  传入数组")
     private String userRechargeCredentialsUrl;
 
-//    @NotBlank(message = "商家开户银行不能为空")
-//    @ApiModelProperty("商家开户银行")
-//    private String rechargeBank;
-//
-//    @NotBlank(message = "商家开户名称不能为空")
-//    @ApiModelProperty("商家开户名称")
-//    private String rechargeName;
-//
-//    @NotBlank(message = "商家银行卡号")
-//    @ApiModelProperty("商家银行卡号")
-//    private String rechargeBankNumber;
 
 }

common/src/main/java/com/jumeirah/common/mapper/MerchantMapper.java

+package com.jumeirah.common.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jumeirah.common.entity.Merchant;
+import com.jumeirah.common.param.MerchantPageParam;
+import com.jumeirah.common.vo.MerchantQueryVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.io.Serializable;
+
+/**
+ * 航空公司商家表 Mapper 接口
+ *
+ * @author giao
+ * @since 2020-10-13
+ */
+@Repository
+public interface MerchantMapper extends BaseMapper<Merchant> {
+
+    /**
+     * 根据ID获取查询对象
+     *
+     * @param id
+     * @return
+     */
+    MerchantQueryVo getMerchantById(Serializable id);
+
+    /**
+     * 获取分页对象
+     *
+     * @param page
+     * @param merchantPageParam
+     * @return
+     */
+    IPage<MerchantQueryVo> getMerchantPageList(@Param("page") Page page, @Param("param") MerchantPageParam merchantPageParam);
+
+}

common/src/main/java/com/jumeirah/common/mapper/MerchantUserMapper.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jumeirah.common.entity.MerchantUser;
 import com.jumeirah.common.param.MerchantUserPageParam;
-import com.jumeirah.common.vo.MerchantUserQueryForAppVo;
 import com.jumeirah.common.vo.MerchantUserQueryVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -38,8 +37,4 @@ public interface MerchantUserMapper extends BaseMapper<MerchantUser> {
      */
     IPage<MerchantUserQueryVo> getMerchantUserPageList(@Param("page") Page page, @Param("param") MerchantUserPageParam merchantUserPageParam);
 
-
-    IPage<MerchantUserQueryForAppVo> getMerchantUserForAppPageList(@Param("page") Page page, @Param("param") MerchantUserPageParam merchantUserPageParam);
-
-
 }

common/src/main/java/com/jumeirah/common/param/MerchantPageParam.java

+package com.jumeirah.common.param;
+
+import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <pre>
+ * 航空公司商家表 分页参数对象
+ * </pre>
+ *
+ * @author giao
+ * @date 2020-10-13
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "商家表分页参数")
+public class MerchantPageParam extends BasePageOrderParam {
+    private static final long serialVersionUID = 1L;
+}

common/src/main/java/com/jumeirah/common/service/MerchantService.java

+package com.jumeirah.common.service;
+
+import com.jumeirah.common.entity.Merchant;
+import com.jumeirah.common.param.MerchantPageParam;
+import com.jumeirah.common.vo.MerchantQueryVo;
+import io.geekidea.springbootplus.framework.common.service.BaseService;
+import io.geekidea.springbootplus.framework.core.pagination.Paging;
+
+/**
+ * 航空公司商家表 服务类
+ *
+ * @author giao
+ * @since 2020-10-13
+ */
+public interface MerchantService extends BaseService<Merchant> {
+
+    /**
+     * 保存
+     *
+     * @param merchant
+     * @return
+     * @throws Exception
+     */
+    boolean saveMerchant(Merchant merchant) throws Exception;
+
+    /**
+     * 修改
+     *
+     * @param merchant
+     * @return
+     * @throws Exception
+     */
+    boolean updateMerchant(Merchant merchant) throws Exception;
+
+    /**
+     * 删除
+     *
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    boolean deleteMerchant(Long id) throws Exception;
+
+    /**
+     * 根据ID获取查询对象
+     *
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    MerchantQueryVo getMerchantById(Long id) throws Exception;
+
+    /**
+     * 获取分页对象
+     *
+     * @param merchantPageParam
+     * @return
+     * @throws Exception
+     */
+    Paging<MerchantQueryVo> getMerchantPageList(MerchantPageParam merchantPageParam) throws Exception;
+
+}

common/src/main/java/com/jumeirah/common/service/MerchantUserService.java

@@ -4,7 +4,6 @@ import com.jumeirah.common.entity.MerchantUser;
 import com.jumeirah.common.param.LoginParam;
 import com.jumeirah.common.param.MerchantUserPageParam;
 import com.jumeirah.common.vo.LoginSysUserTokenVo;
-import com.jumeirah.common.vo.MerchantUserQueryForAppVo;
 import com.jumeirah.common.vo.MerchantUserQueryVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.service.BaseService;
@@ -78,13 +77,5 @@ public interface MerchantUserService extends BaseService<MerchantUser> {
 
 
 
-        /**
-         * 获取分页对象
-         *
-         * @param merchantUserPageParam
-         * @return
-         * @throws Exception
-         */
-        Paging<MerchantUserQueryForAppVo> getMerchantUserPageListForApp(MerchantUserPageParam merchantUserPageParam) throws Exception;
 
 }

common/src/main/java/com/jumeirah/common/service/impl/MerchantServiceImpl.java

+package com.jumeirah.common.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jumeirah.common.entity.Merchant;
+import com.jumeirah.common.mapper.MerchantMapper;
+import com.jumeirah.common.param.MerchantPageParam;
+import com.jumeirah.common.service.MerchantService;
+import com.jumeirah.common.vo.MerchantQueryVo;
+import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
+import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
+import io.geekidea.springbootplus.framework.core.pagination.Paging;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 航空公司商家表 服务实现类
+ *
+ * @author giao
+ * @since 2020-10-13
+ */
+@Slf4j
+@Service
+public class MerchantServiceImpl extends BaseServiceImpl<MerchantMapper, Merchant> implements MerchantService {
+
+    @Autowired
+    private MerchantMapper merchantMapper;
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean saveMerchant(Merchant merchant) throws Exception {
+        return super.save(merchant);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean updateMerchant(Merchant merchant) throws Exception {
+        return super.updateById(merchant);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public boolean deleteMerchant(Long id) throws Exception {
+        return super.removeById(id);
+    }
+
+    @Override
+    public MerchantQueryVo getMerchantById(Long id) throws Exception {
+        return merchantMapper.getMerchantById(id);
+    }
+
+    @Override
+    public Paging<MerchantQueryVo> getMerchantPageList(MerchantPageParam merchantPageParam) throws Exception {
+        Page<MerchantQueryVo> page = new PageInfo<>(merchantPageParam, OrderItem.desc(getLambdaColumn(Merchant::getCreateTime)));
+        IPage<MerchantQueryVo> iPage = merchantMapper.getMerchantPageList(page, merchantPageParam);
+        return new Paging<MerchantQueryVo>(iPage);
+    }
+
+}

common/src/main/java/com/jumeirah/common/service/impl/MerchantUserServiceImpl.java

@@ -15,7 +15,6 @@ import com.jumeirah.common.service.MerchantRolePermissionService;
 import com.jumeirah.common.service.MerchantRoleService;
 import com.jumeirah.common.service.MerchantUserService;
 import com.jumeirah.common.vo.LoginSysUserTokenVo;
-import com.jumeirah.common.vo.MerchantUserQueryForAppVo;
 import com.jumeirah.common.vo.MerchantUserQueryVo;
 import io.geekidea.springbootplus.config.properties.JwtProperties;
 import io.geekidea.springbootplus.config.properties.SpringBootPlusProperties;
@@ -220,11 +219,5 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
         return new Paging<MerchantUserQueryVo>(iPage);
     }
 
-    @Override
-    public Paging<MerchantUserQueryForAppVo> getMerchantUserPageListForApp(MerchantUserPageParam merchantUserPageParam) throws Exception {
-        Page<MerchantUserQueryForAppVo> page = new PageInfo<>(merchantUserPageParam, OrderItem.desc(getLambdaColumn(MerchantUser::getCreateTime)));
-        IPage<MerchantUserQueryForAppVo> iPage = merchantUserMapper.getMerchantUserForAppPageList(page, merchantUserPageParam);
-        return new Paging<MerchantUserQueryForAppVo>(iPage);
-    }
 
 }

common/src/main/java/com/jumeirah/common/vo/MerchantUserQueryForAppVo.java → common/src/main/java/com/jumeirah/common/vo/MerchantQueryVo.java

@@ -6,26 +6,60 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * <pre>
- * 商家 查询结果对象
+ * 航空公司商家表 查询结果对象
  * </pre>
  *
- * @author wei
- * @date 2020-09-28
+ * @author giao
+ * @date 2020-10-13
  */
 @Data
 @Accessors(chain = true)
-@ApiModel(value = "MerchantUserQueryForAppVo对象")
-public class MerchantUserQueryForAppVo implements Serializable {
+@ApiModel(value = "MerchantQueryVo对象")
+public class MerchantQueryVo implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键")
     private Long id;
 
-    @ApiModelProperty("航空公司名称")
-    private String airlineName;
+    @ApiModelProperty("商家名称")
+    private String name;
+
+    @ApiModelProperty("联系人手机号码")
+    private String phone;
+
+    @ApiModelProperty("联系人手机区号")
+    private String phoneArea;
+
+    @ApiModelProperty("公司头像")
+    private String head;
+
+    @ApiModelProperty("备注")
+    private String remark;
+
+    @ApiModelProperty("状态，0：禁用，1：启用，2：锁定")
+    private Integer state;
+
+    @ApiModelProperty("逻辑删除，0：未删除，1：已删除")
+    private Integer deleted;
+
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+
+    @ApiModelProperty("修改时间")
+    private Date updateTime;
+
+    @ApiModelProperty("商家开户银行")
+    private String rechargeBank;
+
+    @ApiModelProperty("商家开户名称")
+    private String rechargeName;
+
+    @ApiModelProperty("商家银行卡号")
+    private String rechargeBankNumber;
 
     @ApiModelProperty("在列表展示的图片url")
     private String imageListUrl;
@@ -47,4 +81,7 @@ public class MerchantUserQueryForAppVo implements Serializable {
 
     @ApiModelProperty("优势介绍文字")
     private String textAdvantage;
+
+    @ApiModelProperty("航空公司名称")
+    private String airlineName;
 }
\ No newline at end of file

common/src/main/java/com/jumeirah/common/vo/MerchantUserQueryVo.java

@@ -76,25 +76,4 @@ public class MerchantUserQueryVo implements Serializable {
 
         @ApiModelProperty("修改时间")
         private Timestamp updateTime;
-
-        @ApiModelProperty("在列表展示的图片url")
-        private String imageListUrl;
-
-        @ApiModelProperty("公司介绍图片url")
-        private String imageCompanyIntroductionUrl;
-
-        @ApiModelProperty("团队介绍图片url")
-        private String imageTeamIntroductionUrl;
-
-        @ApiModelProperty("优势图片url")
-        private String imageAdvantageUrl;
-
-        @ApiModelProperty("公司介绍文字")
-        private String textCompanyIntroduction;
-
-        @ApiModelProperty("团队介绍文字")
-        private String textTeamIntroduction;
-
-        @ApiModelProperty("优势介绍文字")
-        private String textAdvantage;
 }
\ No newline at end of file

common/src/main/resources/mapper/MerchantMapper.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.jumeirah.common.mapper.MerchantMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, name, phone, phone_area, head, remark, state, deleted, create_time, update_time, recharge_bank, recharge_name, recharge_bank_number, image_list_url, image_company_introduction_url, image_team_introduction_url, image_advantage_url, text_company_introduction, text_team_introduction, text_advantage, airline_name
+    </sql>
+
+    <select id="getMerchantById" resultType="com.jumeirah.common.vo.MerchantQueryVo">
+        select
+        <include refid="Base_Column_List"/>
+        from merchant where id = #{id}
+    </select>
+
+    <select id="getMerchantPageList" parameterType="com.jumeirah.common.param.MerchantPageParam"
+            resultType="com.jumeirah.common.vo.MerchantQueryVo">
+        select
+        <include refid="Base_Column_List"/>
+        from merchant
+    </select>
+
+</mapper>

common/src/main/resources/mapper/merchant/MerchantUserMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, username, nickname, password, salt, phone, phone_area, gender, head, remark, state, department_id, role_id, deleted, version, create_time, update_time, recharge_bank, recharge_name, recharge_bank_number, image_list_url, image_company_introduction_url, image_team_introduction_url, image_advantage_url, text_company_introduction, text_team_introduction, text_advantage,airline_name
+        id, username, nickname, password, salt, phone, phone_area, gender, head, remark, state, department_id, role_id, deleted, version, create_time, update_time
     </sql>
 
     <select id="getMerchantUserById" resultType="com.jumeirah.common.vo.MerchantUserQueryVo">
@@ -20,12 +20,6 @@
         from merchant_user
     </select>
 
-    <select id="getMerchantUserForAppPageList" parameterType="com.jumeirah.common.param.MerchantUserPageParam"
-            resultType="com.jumeirah.common.vo.MerchantUserQueryForAppVo">
-        select
-        <include refid="Base_Column_List"/>
-        from merchant_user
-    </select>