经销商购票

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelAddrController.java

@@ -48,7 +48,7 @@ public class ChannelAddrController {
    */
   @PostMapping("/address/list")
   @ApiOperation(value = "渠道地址列表" , notes = "获取渠道的所有地址信息")
-  public AjaxResult list() {
+  public AjaxResult list(@RequestBody AddrParam addrParam) {
     Long channelId = SecurityUtils.getLoginUser().getChannelId();
     List<ChannelAddr> channelAddrs = channelAddrService.list(
         new LambdaQueryWrapper<ChannelAddr>().eq(ChannelAddr::getChannelId, channelId)

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/ChannelTicketController.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
+ *
+ * https://www.mall4j.com/
+ *
+ * 未经允许，不可做商业用途！
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.qs.mp.web.controller.api.channel;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.mp.admin.domain.TicketBox;
+import com.qs.mp.admin.domain.param.TicketBoxParam;
+import com.qs.mp.admin.service.ITicketBoxService;
+import com.qs.mp.channel.domain.ChannelAddr;
+import com.qs.mp.channel.domain.param.AddrParam;
+import com.qs.mp.channel.service.IChannelAddrService;
+import com.qs.mp.common.core.domain.AjaxResult;
+import com.qs.mp.utils.SecurityUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import java.util.Date;
+import java.util.List;
+import javax.validation.Valid;
+import lombok.AllArgsConstructor;
+import ma.glasnost.orika.MapperFacade;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+
+@RestController
+@RequestMapping("/api/v1/mp/channel/mall")
+@Api(tags = "渠道盲票商城接口")
+@AllArgsConstructor
+public class ChannelTicketController {
+
+
+  @Autowired
+  private ITicketBoxService ticketBoxService;
+
+  @Autowired
+  private MapperFacade mapperFacade;
+
+  /**
+   * 盲票进货列表
+   */
+  @PostMapping("/ticket/list")
+  @ApiOperation(value = "盲票组列表" , notes = "获取所有盲票信息")
+  public AjaxResult list(@RequestBody TicketBoxParam param) {
+    List<TicketBox> ticketBoxes = ticketBoxService.list(
+        new LambdaQueryWrapper<TicketBox>().eq(TicketBox::getType, param.getType())
+            .eq(null != param.getCategoryId() && 0 != param.getCategoryId(), TicketBox::getCategoryId, param.getCategoryId()));
+//            .eq()
+//            .orderByDesc(ChannelAddr::getCommonAddr).orderByDesc(ChannelAddr::getUpdateTime));
+
+    return AjaxResult.success(ticketBoxes);
+  }
+
+
+  /**
+   * 获取地址信息订单配送地址
+   */
+  @PostMapping("/address/query")
+  @ApiOperation(value = "获取地址信息" , notes = "根据地址id，获取地址信息")
+  public AjaxResult getInfo(@RequestBody AddrParam addrParam) {
+    if (addrParam.getAddrId() == null || addrParam.getAddrId() == 0) {
+      return AjaxResult.error("参数异常，地址ID缺失");
+    }
+    Long channelId = SecurityUtils.getLoginUser().getChannelId();
+//    ChannelAddr channelAddr = channelAddrService.getChannelAddrByUserId(addrParam.getAddrId(),
+//        channelId);
+    return AjaxResult.success();
+  }
+
+}

mp-common/src/main/java/com/qs/mp/common/enums/TicketTypeEnum.java

@@ -0,0 +1,27 @@
+package com.qs.mp.common.enums;
+
+import com.baomidou.mybatisplus.annotation.IEnum;
+
+/**
+ *
+ * 盲票实体形式
+ *
+ */
+public enum TicketTypeEnum implements IEnum<String> {
+
+  ONLINE("online", "线上票"),
+  OFFLINE("offline", "线下票");
+
+  private final String value;
+  private final String desc;
+
+  TicketTypeEnum(final String value, final String desc) {
+    this.value = value;
+    this.desc = desc;
+  }
+
+  @Override
+  public String getValue() {
+    return value;
+  }
+}

mp-service/src/main/java/com/qs/mp/admin/domain/BoxAwards.java → mp-service/src/main/java/com/qs/mp/admin/domain/TicketAwards.java

@@ -13,9 +13,9 @@ import lombok.Data;
  * @auther quanshu
  * @create 2022-03-02 12:25:55
  */
-@TableName("mp_box_awards")
+@TableName("mp_ticket_awards")
 @Data
-public class BoxAwards implements Serializable {
+public class TicketAwards implements Serializable {
 
   private static final long serialVersionUID = 1L;
 

mp-service/src/main/java/com/qs/mp/admin/domain/BoxAwardsPrize.java → mp-service/src/main/java/com/qs/mp/admin/domain/TicketAwardsPrize.java

@@ -13,9 +13,9 @@ import lombok.Data;
  * @auther quanshu
  * @create 2022-03-02 12:25:55
  */
-@TableName("mp_box_awards_prize")
+@TableName("mp_ticket_awards_prize")
 @Data
-public class BoxAwardsPrize implements Serializable {
+public class TicketAwardsPrize implements Serializable {
 
   private static final long serialVersionUID = 1L;
 

mp-service/src/main/java/com/qs/mp/admin/domain/TicketBox.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.qs.mp.common.enums.TicketTypeEnum;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -41,8 +42,8 @@ public class TicketBox implements Serializable {
   /**
    * 盲票类别
    */
-  @TableField("category")
-  private String category;
+  @TableField("category_id")
+  private Long categoryId;
 
   /**
    * 详细描述
@@ -54,7 +55,7 @@ public class TicketBox implements Serializable {
    * 盲票形式（线上或线下）
    */
   @TableField("type")
-  private String type;
+  private TicketTypeEnum type;
 
   /**
    * 盲票张数

mp-service/src/main/java/com/qs/mp/admin/domain/param/TicketBoxParam.java

@@ -0,0 +1,21 @@
+package com.qs.mp.admin.domain.param;
+
+import com.qs.mp.common.enums.TicketTypeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+@ApiModel(value= "盲票组参数")
+@Data
+public class TicketBoxParam {
+
+	@ApiModelProperty(value = "分类ID",required=true)
+	private Long categoryId;
+
+	@NotNull(message = "盲票类型不能为空")
+	@ApiModelProperty(value = "盲票类型",required=true)
+	private TicketTypeEnum type;
+
+}

mp-service/src/main/java/com/qs/mp/admin/mapper/BoxAwardsMapper.java → mp-service/src/main/java/com/qs/mp/admin/mapper/TicketAwardsMapper.java

@@ -1,6 +1,6 @@
 package com.qs.mp.admin.mapper;
 
-import com.qs.mp.admin.domain.BoxAwards;
+import com.qs.mp.admin.domain.TicketAwards;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -8,6 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @create 2022-03-02 12:25:55
  * @describe 盲票盒奖项设置mapper类
  */
-public interface BoxAwardsMapper extends BaseMapper<BoxAwards> {
+public interface TicketAwardsMapper extends BaseMapper<TicketAwards> {
 
 }

mp-service/src/main/java/com/qs/mp/admin/mapper/BoxAwardsPrizeMapper.java → mp-service/src/main/java/com/qs/mp/admin/mapper/TicketAwardsPrizeMapper.java

@@ -1,6 +1,6 @@
 package com.qs.mp.admin.mapper;
 
-import com.qs.mp.admin.domain.BoxAwardsPrize;
+import com.qs.mp.admin.domain.TicketAwardsPrize;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
@@ -8,6 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @create 2022-03-02 12:25:55
  * @describe 盲票盒奖项对应的奖品设置mapper类
  */
-public interface BoxAwardsPrizeMapper extends BaseMapper<BoxAwardsPrize> {
+public interface TicketAwardsPrizeMapper extends BaseMapper<TicketAwardsPrize> {
 
 }

mp-service/src/main/java/com/qs/mp/admin/service/IBoxAwardsPrizeService.java → mp-service/src/main/java/com/qs/mp/admin/service/ITicketAwardsPrizeService.java

@@ -1,6 +1,6 @@
 package com.qs.mp.admin.service;
 
-import com.qs.mp.admin.domain.BoxAwardsPrize;
+import com.qs.mp.admin.domain.TicketAwardsPrize;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author quanshu
  * @since 2022-03-02
  */
-public interface IBoxAwardsPrizeService extends IService<BoxAwardsPrize> {
+public interface ITicketAwardsPrizeService extends IService<TicketAwardsPrize> {
 
 }

mp-service/src/main/java/com/qs/mp/admin/service/IBoxAwardsService.java → mp-service/src/main/java/com/qs/mp/admin/service/ITicketAwardsService.java

@@ -1,6 +1,6 @@
 package com.qs.mp.admin.service;
 
-import com.qs.mp.admin.domain.BoxAwards;
+import com.qs.mp.admin.domain.TicketAwards;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author quanshu
  * @since 2022-03-02
  */
-public interface IBoxAwardsService extends IService<BoxAwards> {
+public interface ITicketAwardsService extends IService<TicketAwards> {
 
 }

mp-service/src/main/java/com/qs/mp/admin/service/impl/BoxAwardsPrizeServiceImpl.java

@@ -1,20 +0,0 @@
-package com.qs.mp.admin.service.impl;
-
-import com.qs.mp.admin.domain.BoxAwardsPrize;
-import com.qs.mp.admin.mapper.BoxAwardsPrizeMapper;
-import com.qs.mp.admin.service.IBoxAwardsPrizeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 盲票盒奖项对应的奖品设置 服务实现类
- * </p>
- *
- * @author quanshu
- * @since 2022-03-02
- */
-@Service
-public class BoxAwardsPrizeServiceImpl extends ServiceImpl<BoxAwardsPrizeMapper, BoxAwardsPrize> implements IBoxAwardsPrizeService {
-
-}

mp-service/src/main/java/com/qs/mp/admin/service/impl/BoxAwardsServiceImpl.java

@@ -1,20 +0,0 @@
-package com.qs.mp.admin.service.impl;
-
-import com.qs.mp.admin.domain.BoxAwards;
-import com.qs.mp.admin.mapper.BoxAwardsMapper;
-import com.qs.mp.admin.service.IBoxAwardsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 盲票盒奖项设置 服务实现类
- * </p>
- *
- * @author quanshu
- * @since 2022-03-02
- */
-@Service
-public class BoxAwardsServiceImpl extends ServiceImpl<BoxAwardsMapper, BoxAwards> implements IBoxAwardsService {
-
-}

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketAwardsPrizeServiceImpl.java

@@ -0,0 +1,21 @@
+package com.qs.mp.admin.service.impl;
+
+import com.qs.mp.admin.domain.TicketAwardsPrize;
+import com.qs.mp.admin.mapper.TicketAwardsPrizeMapper;
+import com.qs.mp.admin.service.ITicketAwardsPrizeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 盲票盒奖项对应的奖品设置 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-02
+ */
+@Service
+public class TicketAwardsPrizeServiceImpl extends ServiceImpl<TicketAwardsPrizeMapper, TicketAwardsPrize> implements
+    ITicketAwardsPrizeService {
+
+}

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketAwardsServiceImpl.java

@@ -0,0 +1,21 @@
+package com.qs.mp.admin.service.impl;
+
+import com.qs.mp.admin.domain.TicketAwards;
+import com.qs.mp.admin.mapper.TicketAwardsMapper;
+import com.qs.mp.admin.service.ITicketAwardsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 盲票盒奖项设置 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-02
+ */
+@Service
+public class TicketAwardsServiceImpl extends ServiceImpl<TicketAwardsMapper, TicketAwards> implements
+    ITicketAwardsService {
+
+}

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelCommission.java

@@ -32,12 +32,6 @@ public class ChannelCommission implements Serializable {
   @TableField("channel_id")
   private Long channelId;
 
-  /**
-   * 渠道编号
-   */
-  @TableField("channel_no")
-  private String channelNo;
-
   /**
    * 用户订单ID
    */

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelUserRel.java

@@ -31,12 +31,6 @@ public class ChannelUserRel implements Serializable {
   @TableField("channel_id")
   private Long channelId;
 
-  /**
-   * 渠道编号
-   */
-  @TableField("channel_no")
-  private String channelNo;
-
   /**
    * 用户ID
    */

mp-service/src/main/resources/mapper/admin/BoxAwardsMapper.xml → mp-service/src/main/resources/mapper/admin/TicketAwardsMapper.xml

@@ -1,9 +1,9 @@
 <?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.qs.mp.admin.mapper.BoxAwardsMapper">
+<mapper namespace="com.qs.mp.admin.mapper.TicketAwardsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.BoxAwards">
+    <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.TicketAwards">
         <id column="awards_id" property="awardsId" />
         <result column="box_id" property="boxId" />
         <result column="name" property="name" />
@@ -20,4 +20,4 @@
         awards_id, box_id, name, sort, quantity, memo, cashed_qty, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>

mp-service/src/main/resources/mapper/admin/BoxAwardsPrizeMapper.xml → mp-service/src/main/resources/mapper/admin/TicketAwardsPrizeMapper.xml

@@ -1,9 +1,9 @@
 <?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.qs.mp.admin.mapper.BoxAwardsPrizeMapper">
+<mapper namespace="com.qs.mp.admin.mapper.TicketAwardsPrizeMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.BoxAwardsPrize">
+    <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.TicketAwardsPrize">
         <id column="id" property="id" />
         <result column="awards_id" property="awardsId" />
         <result column="prize_id" property="prizeId" />
@@ -19,4 +19,4 @@
         id, awards_id, prize_id, prize_type, quantity, cashed_qty, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>

mp-service/src/main/resources/mapper/admin/TicketBoxMapper.xml

@@ -7,7 +7,7 @@
         <id column="box_id" property="boxId" />
         <result column="title" property="title" />
         <result column="pic_url" property="picUrl" />
-        <result column="category" property="category" />
+        <result column="category_id" property="categoryId" />
         <result column="description" property="description" />
         <result column="type" property="type" />
         <result column="quantity" property="quantity" />
@@ -28,7 +28,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        box_id, title, pic_url, category, description, type, quantity, sale_qty, box_price, box_sale_price, pkg_unit, pkg_qty, sale_pkg_qty, face_price, sale_price, sale_comm_rate, properties, status, created_time, updated_time
+        box_id, title, pic_url, category_id, description, type, quantity, sale_qty, box_price, box_sale_price, pkg_unit, pkg_qty, sale_pkg_qty, face_price, sale_price, sale_comm_rate, properties, status, created_time, updated_time
     </sql>
 
 </mapper>

mp-service/src/main/resources/mapper/channel/ChannelCommissionMapper.xml

@@ -6,7 +6,6 @@
     <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.ChannelCommission">
         <id column="id" property="id" />
         <result column="channel_id" property="channelId" />
-        <result column="channel_no" property="channelNo" />
         <result column="order_id" property="orderId" />
         <result column="ticket_id" property="ticketId" />
         <result column="sale_price" property="salePrice" />
@@ -20,7 +19,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, channel_id, channel_no, order_id, ticket_id, sale_price, sale_comm_rate, sale_comm_amt, comm_rate, comm_amt, created_time, updated_time
+        id, channel_id, order_id, ticket_id, sale_price, sale_comm_rate, sale_comm_amt, comm_rate, comm_amt, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>

mp-service/src/main/resources/mapper/channel/ChannelUserRelMapper.xml

@@ -6,7 +6,6 @@
     <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.ChannelUserRel">
         <id column="id" property="id" />
         <result column="channel_id" property="channelId" />
-        <result column="channel_no" property="channelNo" />
         <result column="user_id" property="userId" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
@@ -14,7 +13,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, channel_id, channel_no, user_id, created_time, updated_time
+        id, channel_id, user_id, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>