Merge branch 'dev/lanpingxiong' into 'master'

Dev/lanpingxiong

See merge request hewei/Jumeirah!62

api-merchant/src/main/java/com/jumeirah/api/merchant/controller/plain/McPlainController.java

@@ -2,9 +2,13 @@ package com.jumeirah.api.merchant.controller.plain;
 
 import com.jumeirah.api.merchant.entity.param.McPlainAddParam;
 import com.jumeirah.common.entity.McPlain;
+import com.jumeirah.common.entity.PlainType;
+import com.jumeirah.common.enums.PlainTypeStatusEnum;
 import com.jumeirah.common.param.McPlainPageParam;
 import com.jumeirah.common.service.McPlainService;
+import com.jumeirah.common.service.PlainTypeService;
 import com.jumeirah.common.vo.McPlainQueryVo;
+import io.geekidea.springbootplus.framework.common.api.ApiCode;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
@@ -42,6 +46,9 @@ public class McPlainController extends BaseController {
     @Autowired
     private McPlainService mcPlainService;
 
+    @Autowired
+    private PlainTypeService plainTypeService;
+
     /**
      * 添加商家飞机表
      */
@@ -50,6 +57,9 @@ public class McPlainController extends BaseController {
     @ApiOperation(value = "添加商家飞机表")
     @RequiresPermissions("merchant:aircraft:management:edit")
     public ApiResult<Boolean> addMcPlain(@Validated(Add.class) @RequestBody McPlainAddParam mcPlainAddParam) throws Exception {
+        if (checkPtId(mcPlainAddParam)) {
+            return ApiResult.result(ApiCode.PLAIN_TYPE_NOT_FOUND, null);
+        }
         McPlain mcPlain = new McPlain();
         BeanUtils.copyProperties(mcPlainAddParam, mcPlain);
         JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
@@ -58,6 +68,14 @@ public class McPlainController extends BaseController {
         return ApiResult.result(flag);
     }
 
+    private boolean checkPtId(@RequestBody @Validated(Add.class) McPlainAddParam mcPlainAddParam) {
+        PlainType plainType = plainTypeService.getById(mcPlainAddParam.getPtId());
+        if (plainType == null || plainType.getStatus().intValue() == PlainTypeStatusEnum.CANCEL.getCode()) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * 修改商家飞机表
      */
@@ -66,6 +84,9 @@ public class McPlainController extends BaseController {
     @ApiOperation(value = "修改商家飞机表")
     @RequiresPermissions("merchant:aircraft:management:edit")
     public ApiResult<Boolean> updateMcPlain(@Validated(Update.class) @RequestBody McPlainAddParam mcPlainAddParam) throws Exception {
+        if (checkPtId(mcPlainAddParam)) {
+            return ApiResult.result(ApiCode.PLAIN_TYPE_NOT_FOUND, null);
+        }
         McPlain mcPlain = new McPlain();
         BeanUtils.copyProperties(mcPlainAddParam, mcPlain);
         boolean flag = mcPlainService.updateMcPlain(mcPlain);

common/src/main/java/com/jumeirah/common/enums/PlainTypeStatusEnum.java

+package com.jumeirah.common.enums;
+
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 状态，0-审核中，1-进行中，2-已完成，99-取消
+ */
+@Getter
+@AllArgsConstructor
+public enum PlainTypeStatusEnum implements BaseEnum {
+
+    OK(0, "正常"),
+    DISABLE(1, "禁用"),
+    CANCEL(99, "删除");
+
+    /**
+     * 编号
+     */
+    private final Integer code;
+    /**
+     * 名称
+     */
+    private final String desc;
+
+
+}

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

@@ -34,9 +34,11 @@ public interface BusinessPlainMapper extends BaseMapper<BusinessPlain> {
      *
      * @param page
      * @param businessPlainPageParam
+     * @param mcId
      * @return
      */
-    IPage<BusinessPlainQueryVo> getBusinessPlainPageList(@Param("page") Page page, @Param("param") BusinessPlainPageParam businessPlainPageParam);
+    IPage<BusinessPlainQueryVo> getBusinessPlainPageList(
+            @Param("page") Page page, @Param("param") BusinessPlainPageParam businessPlainPageParam,@Param("mcId") Long mcId);
 
 
     IPage<BusinessPlainQueryForAppVo> getBusinessPlainPageListForApp(@Param("page") Page page, @Param("param") BusinessPlainPageParam businessPlainPageParam);

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

@@ -35,8 +35,10 @@ public interface ContactStaffMapper extends BaseMapper<ContactStaff> {
      *
      * @param page
      * @param contactStaffPageParam
+     * @param mcId
      * @return
      */
-    IPage<ContactStaffQueryVo> getContactStaffPageList(@Param("page") Page page, @Param("param") ContactStaffPageParam contactStaffPageParam);
+    IPage<ContactStaffQueryVo> getContactStaffPageList(
+            @Param("page") Page page, @Param("param") ContactStaffPageParam contactStaffPageParam, @Param("mcId") Long mcId);
 
 }

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

@@ -35,8 +35,10 @@ public interface McPlainMapper extends BaseMapper<McPlain> {
      *
      * @param page
      * @param mcPlainPageParam
+     * @param mcId
      * @return
      */
-    IPage<McPlainQueryVo> getMcPlainPageList(@Param("page") Page page, @Param("param") McPlainPageParam mcPlainPageParam);
+    IPage<McPlainQueryVo> getMcPlainPageList(
+            @Param("page") Page page, @Param("param") McPlainPageParam mcPlainPageParam, @Param("mcId") Long mcId);
 
 }

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

@@ -35,8 +35,10 @@ public interface StrokeDiscountMapper extends BaseMapper<StrokeDiscount> {
      *
      * @param page
      * @param strokeDiscountPageParam
+     * @param mcId
      * @return
      */
-    IPage<StrokeDiscountQueryVo> getStrokeDiscountPageList(@Param("page") Page page, @Param("param") StrokeDiscountPageParam strokeDiscountPageParam);
+    IPage<StrokeDiscountQueryVo> getStrokeDiscountPageList(
+            @Param("page") Page page, @Param("param") StrokeDiscountPageParam strokeDiscountPageParam, @Param("mcId") Long mcId);
 
 }

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

@@ -56,16 +56,22 @@ public interface StrokeMapper extends BaseMapper<Stroke> {
      *
      * @param page
      * @param mcStrokePageParam
+     * @param mcId
      * @return
      */
-    IPage<McStrokeQueryVo> getMcStrokePageList(@Param("page") Page page, @Param("mcStrokePageParam") McStrokePageParam mcStrokePageParam);
+    IPage<McStrokeQueryVo> getMcStrokePageList(
+            @Param("page") Page page, @Param("mcStrokePageParam") McStrokePageParam mcStrokePageParam,
+            @Param("mcId") Long mcId);
 
     /**
      * 收款记录
      * @param page
      * @param mcStrokePaymentPageParam
+     * @param mcId
      * @return
      */
-    IPage<McStrokePaymentQueryVo> getPaymentPageList(Page<StrokeQueryVo> page,@Param("param") McStrokePaymentPageParam mcStrokePaymentPageParam);
+    IPage<McStrokePaymentQueryVo> getPaymentPageList(
+            Page<StrokeQueryVo> page,@Param("param") McStrokePaymentPageParam mcStrokePaymentPageParam,
+            @Param("mcId") Long mcId);
 
 }

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

@@ -12,7 +12,9 @@ import com.jumeirah.common.vo.BusinessPlainQueryVo;
 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 io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -56,7 +58,8 @@ public class BusinessPlainServiceImpl extends BaseServiceImpl<BusinessPlainMappe
     @Override
     public Paging<BusinessPlainQueryVo> getBusinessPlainPageList(BusinessPlainPageParam businessPlainPageParam) throws Exception {
         Page<BusinessPlainQueryVo> page = new PageInfo<>(businessPlainPageParam, OrderItem.desc(getLambdaColumn(BusinessPlain::getCreateTime)));
-        IPage<BusinessPlainQueryVo> iPage = businessPlainMapper.getBusinessPlainPageList(page, businessPlainPageParam);
+        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
+        IPage<BusinessPlainQueryVo> iPage = businessPlainMapper.getBusinessPlainPageList(page, businessPlainPageParam,jwtToken.getMcId());
         return new Paging<>(iPage);
     }
 

common/src/main/java/com/jumeirah/common/service/impl/ContactStaffServiceImpl.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.ContactStaff;
 import com.jumeirah.common.mapper.ContactStaffMapper;
-import com.jumeirah.common.service.ContactStaffService;
 import com.jumeirah.common.param.ContactStaffPageParam;
 import com.jumeirah.common.param.ContactStaffQueryVo;
+import com.jumeirah.common.service.ContactStaffService;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
-import io.geekidea.springbootplus.framework.core.pagination.Paging;
 import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.transaction.annotation.Transactional;
+import io.geekidea.springbootplus.framework.core.pagination.Paging;
+import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 服务实现类
@@ -55,7 +57,8 @@ public class ContactStaffServiceImpl extends BaseServiceImpl<ContactStaffMapper,
     @Override
     public Paging<ContactStaffQueryVo> getContactStaffPageList(ContactStaffPageParam contactStaffPageParam) throws Exception {
         Page<ContactStaffQueryVo> page = new PageInfo<>(contactStaffPageParam, OrderItem.desc(getLambdaColumn(ContactStaff::getCreateTime)));
-        IPage<ContactStaffQueryVo> iPage = contactStaffMapper.getContactStaffPageList(page, contactStaffPageParam);
+        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
+        IPage<ContactStaffQueryVo> iPage = contactStaffMapper.getContactStaffPageList(page, contactStaffPageParam,jwtToken.getMcId());
         return new Paging<ContactStaffQueryVo>(iPage);
     }
 

common/src/main/java/com/jumeirah/common/service/impl/McPlainServiceImpl.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.McPlain;
 import com.jumeirah.common.mapper.McPlainMapper;
-import com.jumeirah.common.service.McPlainService;
 import com.jumeirah.common.param.McPlainPageParam;
+import com.jumeirah.common.service.McPlainService;
 import com.jumeirah.common.vo.McPlainQueryVo;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
-import io.geekidea.springbootplus.framework.core.pagination.Paging;
 import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.transaction.annotation.Transactional;
+import io.geekidea.springbootplus.framework.core.pagination.Paging;
+import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 商家飞机表 服务实现类
@@ -55,7 +57,8 @@ public class McPlainServiceImpl extends BaseServiceImpl<McPlainMapper, McPlain>
     @Override
     public Paging<McPlainQueryVo> getMcPlainPageList(McPlainPageParam mcPlainPageParam) throws Exception {
         Page<McPlainQueryVo> page = new PageInfo<>(mcPlainPageParam, OrderItem.desc(getLambdaColumn(McPlain::getCreateTime)));
-        IPage<McPlainQueryVo> iPage = mcPlainMapper.getMcPlainPageList(page, mcPlainPageParam);
+        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
+        IPage<McPlainQueryVo> iPage = mcPlainMapper.getMcPlainPageList(page, mcPlainPageParam,jwtToken.getMcId());
         return new Paging<McPlainQueryVo>(iPage);
     }
 

common/src/main/java/com/jumeirah/common/service/impl/StrokeDiscountServiceImpl.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.StrokeDiscount;
 import com.jumeirah.common.enums.StrokeDiscountStatusEnum;
 import com.jumeirah.common.mapper.StrokeDiscountMapper;
-import com.jumeirah.common.service.StrokeDiscountService;
 import com.jumeirah.common.param.StrokeDiscountPageParam;
+import com.jumeirah.common.service.StrokeDiscountService;
 import com.jumeirah.common.vo.StrokeDiscountQueryVo;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
-import io.geekidea.springbootplus.framework.core.pagination.Paging;
 import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.springframework.transaction.annotation.Transactional;
+import io.geekidea.springbootplus.framework.core.pagination.Paging;
+import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
+import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 优惠行程表 服务实现类
@@ -59,7 +61,8 @@ public class StrokeDiscountServiceImpl extends BaseServiceImpl<StrokeDiscountMap
     @Override
     public Paging<StrokeDiscountQueryVo> getStrokeDiscountPageList(StrokeDiscountPageParam strokeDiscountPageParam) throws Exception {
         Page<StrokeDiscountQueryVo> page = new PageInfo<>(strokeDiscountPageParam, OrderItem.desc(getLambdaColumn(StrokeDiscount::getCreateTime)));
-        IPage<StrokeDiscountQueryVo> iPage = strokeDiscountMapper.getStrokeDiscountPageList(page, strokeDiscountPageParam);
+        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
+        IPage<StrokeDiscountQueryVo> iPage = strokeDiscountMapper.getStrokeDiscountPageList(page, strokeDiscountPageParam, jwtToken.getMcId());
         return new Paging<StrokeDiscountQueryVo>(iPage);
     }
 

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

@@ -112,14 +112,16 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
     @Override
     public Paging<McStrokeQueryVo> getMcStrokePageList(McStrokePageParam mcStrokePageParam) {
         Page<StrokeQueryVo> page = new PageInfo<>(mcStrokePageParam, OrderItem.asc(getLambdaColumn(Stroke::getCreateTime)));
-        IPage<McStrokeQueryVo> mcStrokePageList = strokeMapper.getMcStrokePageList(page, mcStrokePageParam);
+        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
+        IPage<McStrokeQueryVo> mcStrokePageList = strokeMapper.getMcStrokePageList(page, mcStrokePageParam, jwtToken.getMcId());
         return new Paging<McStrokeQueryVo>(mcStrokePageList);
     }
 
     @Override
     public Paging<McStrokePaymentQueryVo> getPaymentPageList(McStrokePaymentPageParam mcStrokePaymentPageParam) {
         Page<StrokeQueryVo> page = new PageInfo<>(mcStrokePaymentPageParam);
-        IPage<McStrokePaymentQueryVo> mcStrokePageList = strokeMapper.getPaymentPageList(page, mcStrokePaymentPageParam);
+        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
+        IPage<McStrokePaymentQueryVo> mcStrokePageList = strokeMapper.getPaymentPageList(page, mcStrokePaymentPageParam, jwtToken.getMcId());
         return new Paging<McStrokePaymentQueryVo>(mcStrokePageList);
     }
 

common/src/main/resources/mapper/BusinessPlainMapper.xml

@@ -38,6 +38,7 @@
         select
             <include refid="Base_Column_List"/>
         from business_plain
+        where mc_id = #{mcId}
     </select>
 
     <resultMap id="pageListMap" type="com.jumeirah.common.vo.BusinessPlainQueryVo">

common/src/main/resources/mapper/ContactStaffMapper.xml

@@ -18,6 +18,7 @@
         select
         <include refid="Base_Column_List"/>
         from contact_staff
+        where mc_id = #{mcId}
     </select>
 
 </mapper>

common/src/main/resources/mapper/McPlainMapper.xml

@@ -30,6 +30,7 @@
         from mc_plain mp
         left join plain_type pt on pt.id = mp.pt_id
         left join city_three_code ctc on ctc.id = mp.city_id
+        where mp.mc_id = #{mcId}
     </select>
 
 </mapper>

common/src/main/resources/mapper/StrokeDiscountMapper.xml

@@ -38,6 +38,7 @@
         from stroke_discount sd
         INNER JOIN city_three_code ctco ON ctco.id = sd.city_outset_id
         INNER JOIN city_three_code ctca ON ctca.id = sd.city_arrive_id
+        where sd.mc_id = #{mcId}
     </select>
 
 </mapper>

common/src/main/resources/mapper/StrokeMapper.xml

@@ -136,6 +136,7 @@
             INNER JOIN city_three_code ctco ON ctco.id = s.city_outset_id
             INNER JOIN city_three_code ctca ON ctca.id = s.city_arrive_id
             <where>
+                s.mc_id = #{mcId}
                 <if test="mcStrokePageParam.status != null and mcStrokePageParam.status != -1">
                     AND s.status = #{mcStrokePageParam.status}
                 </if>
@@ -173,6 +174,7 @@
             stroke s
         LEFT JOIN app_user au ON au.id = s.user_id
         <where>
+            s.mc_id = #{mcId}
             <if test="param.paymentStatus != null and param.paymentStatus != -1">
                 AND s.status = #{param.paymentStatus}
             </if>

config/src/main/resources/static/i18n/messages_en_US.properties

@@ -77,4 +77,5 @@ api.response.code.JWTDECODE_EXCEPTION=JWTDECODE_EXCEPTION
 api.response.code.HTTP_REQUEST_METHOD_NOT_SUPPORTED_EXCEPTION=HTTP_REQUEST_METHOD_NOT_SUPPORTED_EXCEPTION
 api.response.code.user.PWD_OR_USERNAME_ERROR=password or phone number error
 api.response.code.user.SMS_CODE_ERROR=sms code error
-api.response.code.user.USER_NOT_FOUND=user not found
\ No newline at end of file
+api.response.code.user.USER_NOT_FOUND=user not found
+api.response.code.user.PLAIN_TYPE_NOT_FOUND=plain type not found

config/src/main/resources/static/i18n/messages_zh_CN.properties

@@ -77,4 +77,5 @@ api.response.code.JWTDECODE_EXCEPTION=Token解析异常
 api.response.code.HTTP_REQUEST_METHOD_NOT_SUPPORTED_EXCEPTION=默认的异常处理
 api.response.code.user.PWD_OR_USERNAME_ERROR=账号或密码错误
 api.response.code.user.SMS_CODE_ERROR=验证码错误
-api.response.code.user.USER_NOT_FOUND=用户不存在
\ No newline at end of file
+api.response.code.user.USER_NOT_FOUND=用户不存在
+api.response.code.user.PLAIN_TYPE_NOT_FOUND=飞机类型不存在

framework/src/main/java/io/geekidea/springbootplus/framework/common/api/ApiCode.java

@@ -116,7 +116,12 @@ public enum ApiCode {
     /**
      * 用户不存在
      */
-    USER_NOT_FOUND(6003, "api.response.code.user.USER_NOT_FOUND");
+    USER_NOT_FOUND(6003, "api.response.code.user.USER_NOT_FOUND"),
+    /**
+     * 飞机类型不存在
+     */
+    PLAIN_TYPE_NOT_FOUND(6004, "api.response.code.user.PLAIN_TYPE_NOT_FOUND"),
+    ;
 
     private final int code;
     private final String message;