Merge branch 'dev/lanpingxiong' into 'master'

Dev/lanpingxiong

See merge request hewei/Jumeirah!43

api-merchant/src/main/java/com/jumeirah/api/merchant/controller/McAppUserController.java

+package com.jumeirah.api.merchant.controller;
+
+import com.jumeirah.api.merchant.entity.param.McAppUserParam;
+import com.jumeirah.common.entity.AppUser;
+import com.jumeirah.common.service.AppUserService;
+import com.jumeirah.common.vo.AppUserQueryVo;
+import io.geekidea.springbootplus.framework.common.api.ApiResult;
+import io.geekidea.springbootplus.framework.common.controller.BaseController;
+import io.geekidea.springbootplus.framework.log.annotation.Module;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * APP用户 控制器
+ *
+ * @author wei
+ * @since 2020-09-23
+ */
+@Slf4j
+@RestController
+@Module("api-app")
+@Api(value = "app用户API", tags = {"APP用户相关"})
+@RequestMapping("/merchant/appUser/")
+public class McAppUserController extends BaseController {
+
+    @Autowired
+    private AppUserService appUserService;
+
+    /**
+     * APP用户分页列表
+     */
+    @PostMapping("/getList")
+    @OperationLog(name = "APP用户分页列表", type = OperationLogType.PAGE)
+    @ApiOperation(value = "APP用户分页列表", response = AppUserQueryVo.class)
+    public ApiResult<List<AppUser>>  getAppUserPageList(@Validated @RequestBody McAppUserParam mcAppUserParam) throws Exception {
+        List<AppUser> appUsers = appUserService.listByIds(mcAppUserParam.getIds());
+        return ApiResult.ok(appUsers);
+    }
+
+
+}
+

api-merchant/src/main/java/com/jumeirah/api/merchant/controller/management/McStrokePaymentController.java

+package com.jumeirah.api.merchant.controller.management;
+
+import com.jumeirah.common.param.McStrokePaymentPageParam;
+import com.jumeirah.common.service.StrokeService;
+import com.jumeirah.common.vo.McStrokePaymentQueryVo;
+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.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.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+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 wei
+ * @since 2020-09-29
+ */
+@Slf4j
+@RestController
+@RequestMapping("/merchant/payment")
+@Api(value = "财务管理API", tags = {"财务管理"})
+public class McStrokePaymentController extends BaseController {
+
+    @Autowired
+    private StrokeService strokeService;
+
+    /**
+     * 收款记录
+     */
+    @PostMapping("/pageList")
+    @OperationLog(name = "收款记录", type = OperationLogType.PAGE)
+    @ApiOperation(value = "收款记录")
+    @RequiresPermissions("merchant:order:view")
+    public ApiResult<Paging<McStrokePaymentQueryVo>> getPaymentPageList(@Validated @RequestBody McStrokePaymentPageParam mcStrokePaymentPageParam) throws Exception {
+        Paging<McStrokePaymentQueryVo> paging = strokeService.getPaymentPageList(mcStrokePaymentPageParam);
+        return ApiResult.ok(paging);
+    }
+
+
+}
+

api-merchant/src/main/java/com/jumeirah/api/merchant/entity/param/McAppUserParam.java

+package com.jumeirah.api.merchant.entity.param;
+
+import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
+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.List;
+
+/**
+ * 商家飞机表
+ *
+ * @author xxx
+ * @since 2020-10-19
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "McAppUser对象")
+public class McAppUserParam extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    @NotNull(message = "app用户ids不能为空")
+    @ApiModelProperty("app用户ids")
+    private List<Long> ids;
+
+
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.Version;
 import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
 import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
 import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import io.geekidea.springbootplus.framework.core.validator.groups.Update;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
@@ -57,6 +58,7 @@ public class AppUser extends BaseEntity {
 
 
     @NotBlank(message = "密码不能为空")
     @NotBlank(message = "密码不能为空")
     @ApiModelProperty("密码")
     @ApiModelProperty("密码")
+    @JsonIgnore
     private String password;
     private String password;
 
 
     @ApiModelProperty("盐值")
     @ApiModelProperty("盐值")

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jumeirah.common.entity.Stroke;
 import com.jumeirah.common.entity.Stroke;
 import com.jumeirah.common.param.McStrokePageParam;
 import com.jumeirah.common.param.McStrokePageParam;
+import com.jumeirah.common.param.McStrokePaymentPageParam;
 import com.jumeirah.common.param.StrokePageParam;
 import com.jumeirah.common.param.StrokePageParam;
+import com.jumeirah.common.vo.McStrokePaymentQueryVo;
 import com.jumeirah.common.vo.McStrokeQueryVo;
 import com.jumeirah.common.vo.McStrokeQueryVo;
 import com.jumeirah.common.vo.StrokeDetailVo;
 import com.jumeirah.common.vo.StrokeDetailVo;
 import com.jumeirah.common.vo.StrokeQueryVo;
 import com.jumeirah.common.vo.StrokeQueryVo;
@@ -57,4 +59,13 @@ public interface StrokeMapper extends BaseMapper<Stroke> {
      * @return
      * @return
      */
      */
     IPage<McStrokeQueryVo> getMcStrokePageList(@Param("page") Page page, @Param("mcStrokePageParam") McStrokePageParam mcStrokePageParam);
     IPage<McStrokeQueryVo> getMcStrokePageList(@Param("page") Page page, @Param("mcStrokePageParam") McStrokePageParam mcStrokePageParam);
+
+    /**
+     * 收款记录
+     * @param page
+     * @param mcStrokePaymentPageParam
+     * @return
+     */
+    IPage<McStrokePaymentQueryVo> getPaymentPageList(Page<StrokeQueryVo> page,@Param("param") McStrokePaymentPageParam mcStrokePaymentPageParam);
+
 }
 }

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

+package com.jumeirah.common.param;
+
+import io.geekidea.springbootplus.framework.core.pagination.BasePageOrderParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <pre>
+ * 行程表 分页参数对象
+ * </pre>
+ *
+ * @author wei
+ * @date 2020-09-29
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "行程表分页参数")
+public class McStrokePaymentPageParam extends BasePageOrderParam {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("付款状态，-1全部，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")
+    private Integer paymentStatus;
+
+    @ApiModelProperty("主键id")
+    private Long id;
+
+    @ApiModelProperty("开始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+}

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

@@ -2,7 +2,9 @@ package com.jumeirah.common.service;
 
 
 import com.jumeirah.common.entity.Stroke;
 import com.jumeirah.common.entity.Stroke;
 import com.jumeirah.common.param.McStrokePageParam;
 import com.jumeirah.common.param.McStrokePageParam;
+import com.jumeirah.common.param.McStrokePaymentPageParam;
 import com.jumeirah.common.param.StrokePageParam;
 import com.jumeirah.common.param.StrokePageParam;
+import com.jumeirah.common.vo.McStrokePaymentQueryVo;
 import com.jumeirah.common.vo.McStrokeQueryVo;
 import com.jumeirah.common.vo.McStrokeQueryVo;
 import com.jumeirah.common.vo.StrokeDetailVo;
 import com.jumeirah.common.vo.StrokeDetailVo;
 import com.jumeirah.common.vo.StrokeQueryVo;
 import com.jumeirah.common.vo.StrokeQueryVo;
@@ -72,4 +74,11 @@ public interface StrokeService extends BaseService<Stroke> {
      * @return
      * @return
      */
      */
     Paging<McStrokeQueryVo> getMcStrokePageList(McStrokePageParam mcStrokePageParam);
     Paging<McStrokeQueryVo> getMcStrokePageList(McStrokePageParam mcStrokePageParam);
+
+    /**
+     *  收款记录
+     * @param mcStrokePaymentPageParam
+     * @return
+     */
+    Paging<McStrokePaymentQueryVo> getPaymentPageList(McStrokePaymentPageParam mcStrokePaymentPageParam);
 }
 }

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

@@ -7,8 +7,10 @@ import com.jumeirah.common.entity.Stroke;
 import com.jumeirah.common.enums.StrokeStatusEnum;
 import com.jumeirah.common.enums.StrokeStatusEnum;
 import com.jumeirah.common.mapper.StrokeMapper;
 import com.jumeirah.common.mapper.StrokeMapper;
 import com.jumeirah.common.param.McStrokePageParam;
 import com.jumeirah.common.param.McStrokePageParam;
+import com.jumeirah.common.param.McStrokePaymentPageParam;
 import com.jumeirah.common.param.StrokePageParam;
 import com.jumeirah.common.param.StrokePageParam;
 import com.jumeirah.common.service.StrokeService;
 import com.jumeirah.common.service.StrokeService;
+import com.jumeirah.common.vo.McStrokePaymentQueryVo;
 import com.jumeirah.common.vo.McStrokeQueryVo;
 import com.jumeirah.common.vo.McStrokeQueryVo;
 import com.jumeirah.common.vo.StrokeDetailVo;
 import com.jumeirah.common.vo.StrokeDetailVo;
 import com.jumeirah.common.vo.StrokeQueryVo;
 import com.jumeirah.common.vo.StrokeQueryVo;
@@ -106,4 +108,11 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
         return new Paging<McStrokeQueryVo>(mcStrokePageList);
         return new Paging<McStrokeQueryVo>(mcStrokePageList);
     }
     }
 
 
+    @Override
+    public Paging<McStrokePaymentQueryVo> getPaymentPageList(McStrokePaymentPageParam mcStrokePaymentPageParam) {
+        Page<StrokeQueryVo> page = new PageInfo<>(mcStrokePaymentPageParam, OrderItem.asc(getLambdaColumn(Stroke::getCreateTime)));
+        IPage<McStrokePaymentQueryVo> mcStrokePageList = strokeMapper.getPaymentPageList(page, mcStrokePaymentPageParam);
+        return new Paging<McStrokePaymentQueryVo>(mcStrokePageList);
+    }
+
 }
 }

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

+package com.jumeirah.common.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+
+/**
+ * <pre>
+ * 行程表 查询结果对象
+ * </pre>
+ *
+ * @author wei
+ * @date 2020-09-29
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "StrokeQueryVo对象")
+public class McStrokePaymentQueryVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("主键ID")
+    private Long id;
+
+    @ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
+    private Integer type;
+
+    @ApiModelProperty("付款时间")
+    private Timestamp userRechargeTime;
+
+    @ApiModelProperty("付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")
+    private Integer paymentStatus;
+
+    @ApiModelProperty("用户充值金额")
+    private BigDecimal userRechargeMoney;
+
+    @ApiModelProperty("手机号")
+    private String phoneNumber;
+
+    @ApiModelProperty("申请人")
+    private String applicant;
+
+    @ApiModelProperty("付款渠道，0-线下渠道，1-线上渠道")
+    private Integer paymentChannel;
+
+
+}

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

@@ -152,4 +152,37 @@
             ORDER BY s.create_time DESC
             ORDER BY s.create_time DESC
     </select>
     </select>
 
 
+    <select id="getPaymentPageList" parameterType="com.jumeirah.common.param.McStrokePaymentPageParam"
+            resultType="com.jumeirah.common.vo.McStrokePaymentQueryVo">
+        SELECT
+        s.id,
+        s.type,
+        s.user_recharge_time,
+        s.payment_status,
+        s.user_recharge_money,
+        s.payment_channel,
+        CONCAT( au.surname, au.`name` ) AS applicant,
+        au.phone AS phone_number
+        FROM
+        stroke s
+        LEFT JOIN app_user au ON au.id = s.user_id
+
+        <where>
+            <if test="param.paymentStatus != null and param.paymentStatus != -1">
+                AND s.status = #{param.paymentStatus}
+            </if>
+
+            <if test="param.id != null and param.id != 0">
+                AND s.id = #{param.id}
+            </if>
+            <if test="param.startTime != null and param.startTime != ''">
+                AND s.create_time &gt;= #{param.startTime}
+            </if>
+            <if test="param.endTime != null and param.endTime != ''">
+                AND s.create_time &lt;= #{param.endTime}
+            </if>
+        </where>
+        ORDER BY s.create_time DESC
+    </select>
+
 </mapper>
 </mapper>