表字段改成小写

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

@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
+ *
+ * https://www.mall4j.com/
+ *
+ * 未经允许，不可做商业用途！
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.qs.mp.web.controller.api.admin;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.mp.common.core.page.TableDataInfo;
+import com.qs.mp.common.domain.Area;
+import com.qs.mp.common.service.IAreaService;
+import com.qs.mp.web.controller.common.BaseApiController;
+import java.util.List;
+import javax.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author lgh on 2018/10/26.
+ */
+@RestController
+@RequestMapping("/api/v1/mp")
+public class AreaMgrController extends BaseApiController {
+
+    @Autowired
+    private IAreaService areaService;
+
+    /**
+     * 分页获取
+     */
+    @GetMapping("/admin/area/list")
+//    @PreAuthorize("@pms.hasPermission('admin:area:page')")
+    public TableDataInfo page(Area area) {
+        startPage();
+        List<Area> areaList = areaService.list(new LambdaQueryWrapper<Area>());
+        return getDataTable(areaList);
+    }
+
+    /**
+     * 获取省市
+     */
+    @GetMapping("/list")
+//    @PreAuthorize("@pms.hasPermission('admin:area:list')")
+    public ResponseEntity<List<Area>> list(Area area) {
+        List<Area> areas = areaService.list(new LambdaQueryWrapper<Area>()
+                .like(area.getAreaName() != null, Area::getAreaName, area.getAreaName()));
+        return ResponseEntity.ok(areas);
+    }
+
+    /**
+     * 通过父级id获取区域列表
+     */
+    @GetMapping("/listByPid")
+    public ResponseEntity<List<Area>> listByPid(Long pid) {
+        List<Area> list = areaService.listByPid(pid);
+        return ResponseEntity.ok(list);
+    }
+
+    /**
+     * 获取信息
+     */
+    @GetMapping("/info/{id}")
+//    @PreAuthorize("@pms.hasPermission('admin:area:info')")
+    public ResponseEntity<Area> info(@PathVariable("id") Long id) {
+        Area area = areaService.getById(id);
+        return ResponseEntity.ok(area);
+    }
+
+    /**
+     * 保存
+     */
+    @PostMapping
+//    @PreAuthorize("@pms.hasPermission('admin:area:save')")
+    public ResponseEntity<Void> save(@Valid @RequestBody Area area) {
+        if (area.getParentId() != null) {
+            Area parentArea = areaService.getById(area.getParentId());
+            area.setLevel(parentArea.getLevel() + 1);
+        }
+        areaService.save(area);
+        return ResponseEntity.ok().build();
+    }
+
+    /**
+     * 修改
+     */
+    @PutMapping
+//    @PreAuthorize("@pms.hasPermission('admin:area:update')")
+    public ResponseEntity<Void> update(@Valid @RequestBody Area area) {
+        areaService.updateById(area);
+        return ResponseEntity.ok().build();
+    }
+
+    /**
+     * 删除
+     */
+    @DeleteMapping("/{id}")
+//    @PreAuthorize("@pms.hasPermission('admin:area:delete')")
+    public ResponseEntity<Void> delete(@PathVariable Long id) {
+        Area area = areaService.getById(id);
+        areaService.removeById(id);
+        return ResponseEntity.ok().build();
+    }
+
+}

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

@@ -0,0 +1,162 @@
+/*
+ * 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.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.ApiImplicitParam;
+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.aspectj.weaver.loadtime.Aj;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.Mapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+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")
+@Api(tags = "地址接口")
+@AllArgsConstructor
+public class ChannelAddrController {
+
+
+    @Autowired
+    private IChannelAddrService channelAddrService;
+
+    @Autowired
+    private MapperFacade mapperFacade;
+
+    /**
+     * 选择订单配送地址
+     */
+    @PostMapping("/address/list")
+    @ApiOperation(value = "渠道地址列表", notes = "获取渠道的所有地址信息")
+    public AjaxResult list() {
+        Long channelId = SecurityUtils.getLoginUser().getChannelId();
+        List<ChannelAddr> channelAddrs = channelAddrService.list(new LambdaQueryWrapper<ChannelAddr>().eq(ChannelAddr::getChannelId, channelId).orderByDesc(ChannelAddr::getCommonAddr).orderByDesc(ChannelAddr::getUpdateTime));
+        return AjaxResult.success(channelAddrs);
+    }
+
+    @PostMapping("/address/create")
+    @ApiOperation(value = "新增用户地址", notes = "新增用户地址")
+    public AjaxResult create(@Valid @RequestBody AddrParam addrParam) {
+        Long channelId = SecurityUtils.getLoginUser().getChannelId();
+
+        if (addrParam.getAddrId() != null && addrParam.getAddrId() != 0) {
+            return AjaxResult.error("该地址已存在");
+        }
+        int addrCount = channelAddrService.count(new LambdaQueryWrapper<ChannelAddr>().eq(ChannelAddr::getChannelId, channelId));
+        ChannelAddr channelAddr = mapperFacade.map(addrParam, ChannelAddr.class);
+
+        if (addrCount == 0) {
+            channelAddr.setCommonAddr(1);
+        } else {
+            channelAddr.setCommonAddr(0);
+        }
+        channelAddr.setChannelId(channelId);
+        channelAddr.setStatus(1);
+        channelAddr.setCreateTime(new Date());
+        channelAddr.setUpdateTime(new Date());
+        channelAddrService.save(channelAddr);
+
+        return AjaxResult.success("添加地址成功");
+    }
+
+    /**
+     * 修改订单配送地址
+     */
+    @PostMapping("/address/update")
+    @ApiOperation(value = "修改订单用户地址", notes = "修改用户地址")
+    public AjaxResult update(@Valid @RequestBody AddrParam addrParam) {
+        Long channelId = SecurityUtils.getLoginUser().getUserId();
+
+        ChannelAddr dbChannelAddr = channelAddrService.getChannelAddrByUserId(addrParam.getAddrId(), channelId);
+        if (dbChannelAddr == null) {
+            return AjaxResult.error("该地址已被删除");
+        }
+
+        ChannelAddr channelAddr = mapperFacade.map(addrParam, ChannelAddr.class);
+        channelAddr.setChannelId(channelId);
+        channelAddrService.updateById(channelAddr);
+        return AjaxResult.success("修改地址成功");
+    }
+
+    /**
+     * 删除订单配送地址
+     */
+    @PostMapping("/deleteAddr/{addrId}")
+    @ApiOperation(value = "删除订单用户地址", notes = "根据地址id，删除用户地址")
+    @ApiImplicitParam(name = "addrId", value = "地址ID", required = true, dataType = "Long")
+    public AjaxResult deleteDvy(@PathVariable("addrId") Long addrId) {
+        /*String userId = SecurityUtils.getUser().getUserId();
+        UserAddr userAddr = channelAddrService.getUserAddrByUserId(addrId, userId);
+        if (userAddr == null) {
+            return ResponseEntity.badRequest().body("该地址已被删除");
+        }
+        if (userAddr.getCommonAddr() == 1) {
+            return ResponseEntity.badRequest().body("默认地址无法删除");
+        }
+        channelAddrService.removeById(addrId);
+        channelAddrService.removeUserAddrByUserId(addrId, userId);
+        return ResponseEntity.ok("删除地址成功");*/
+        return AjaxResult.success();
+    }
+
+    /**
+     * 设置默认地址
+     */
+    @PutMapping("/defaultAddr/{addrId}")
+    @ApiOperation(value = "设置默认地址", notes = "根据地址id，设置默认地址")
+    public AjaxResult defaultAddr(@PathVariable("addrId") Long addrId) {
+        /*String userId = SecurityUtils.getUser().getUserId();
+
+        channelAddrService.updateDefaultUserAddr(addrId, userId);
+
+        channelAddrService.removeUserAddrByUserId(0L, userId);
+        channelAddrService.removeUserAddrByUserId(addrId, userId);
+        return ResponseEntity.ok("修改地址成功");*/
+        return AjaxResult.success();
+    }
+
+    /**
+     * 获取地址信息订单配送地址
+     */
+    @GetMapping("/addrInfo/{addrId}")
+    @ApiOperation(value = "获取地址信息", notes = "根据地址id，获取地址信息")
+    @ApiImplicitParam(name = "addrId", value = "地址ID", required = true, dataType = "Long")
+    public AjaxResult addrInfo(@PathVariable("addrId") Long addrId) {
+        /*String userId = SecurityUtils.getUser().getUserId();
+        UserAddr userAddr = channelAddrService.getUserAddrByUserId(addrId, userId);
+        if (userAddr == null) {
+            throw new YamiShopBindException("该地址已被删除");
+        }
+        return ResponseEntity.ok(mapperFacade.map(userAddr, UserAddrDto.class));*/
+        return AjaxResult.success();
+    }
+
+}

mp-admin/src/main/java/com/qs/mp/web/controller/api/common/AreaQueryController.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
+ *
+ * https://www.mall4j.com/
+ *
+ * 未经允许，不可做商业用途！
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.qs.mp.web.controller.api.common;
+
+import com.qs.mp.common.domain.Area;
+import com.qs.mp.common.service.IAreaService;
+import com.qs.mp.web.controller.common.BaseApiController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 省市区通用查询，渠道、用户端共用
+ * @author zhongcp on 2022/3/2.
+ */
+@RestController
+@RequestMapping("/api/v1/mp")
+@Api(tags="省市区接口")
+public class AreaQueryController extends BaseApiController {
+
+    @Autowired
+    private IAreaService areaService;
+
+    /**
+	 * 分页获取
+	 */
+    @GetMapping("/area/listByPid")
+    @ApiOperation(value="获取省市区信息", notes="根据省市区的pid获取地址信息")
+    @ApiImplicitParam(name = "pid", value = "省市区的pid(pid为0获取所有省份)", required = true, dataType = "String")
+	public ResponseEntity<List<Area>> listByPid(Long pid){
+		List<Area> list = areaService.listByPid(pid);
+		return ResponseEntity.ok(list);
+	}
+
+}

mp-common/pom.xml

@@ -14,7 +14,7 @@
     <description>
         common通用工具
     </description>
-    
+
      <properties>
         <hutool.version>5.3.1</hutool.version>
         <lombok.version>1.18.10</lombok.version>
@@ -58,7 +58,7 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-  
+
         <!-- JSON工具类 -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -125,6 +125,11 @@
             <artifactId>jjwt</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>ma.glasnost.orika</groupId>
+            <artifactId>orika-core</artifactId>
+        </dependency>
+
         <!-- redis 缓存操作 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -148,7 +153,7 @@
 			<artifactId>okhttp</artifactId>
 			<version>3.10.0</version>
 		</dependency>
-		
+
         <!-- servlet包 -->
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -163,15 +168,15 @@
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
-        
+
         <!--工具包-->
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
             <version>${hutool.version}</version>
         </dependency>
-        
-                    
+
+
         <!--使用 lombok 简化 Java 代码-->
         <dependency>
            <groupId>org.projectlombok</groupId>
@@ -179,7 +184,7 @@
            <version>${lombok.version}</version>
            <scope>compile</scope>
         </dependency>
-        
+
          <!-- Swagger3依赖 -->
          <dependency>
              <groupId>io.springfox</groupId>
@@ -195,4 +200,4 @@
 
     </dependencies>
 
-</project>
+</project>

mp-framework/src/main/java/com/qs/mp/framework/web/service/SysLoginService.java

@@ -292,14 +292,14 @@ public class SysLoginService
      */
     public void fillChannelInfo(LoginUser loginUser){
     	Channel channel = channelService.getChannelByUserId(loginUser.getUserId());
-        if (null != channel && null != channel.getId()){
+        if (null != channel && null != channel.getChannelId()){
             // 校验渠道身份标识
             if (loginUser.getIdentity() == UserIdentityEnum.CHANNEL && channel.getLevel() <= 0) {
                 throw new ServiceException("此账号的渠道不存在");
             } else if (loginUser.getIdentity() == UserIdentityEnum.SALESITE && channel.getLevel() != 0) {
                 throw new ServiceException("此账号的经销商不存在");
             }
-          loginUser.setChannelId(channel.getId());
+          loginUser.setChannelId(channel.getChannelId());
           loginUser.setChannelNo(channel.getChannelNo());
         } else {
             throw new ServiceException("登录账号不存在");

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

@@ -1,4 +1,4 @@
-package com.qs.mp.manager.domain;
+package com.qs.mp.admin.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -11,7 +11,7 @@ import lombok.Data;
 /**
  * @describe 盲票盒奖项设置实体类
  * @auther quanshu
- * @create 2022-02-28 22:58:02
+ * @create 2022-03-02 12:25:55
  */
 @TableName("mp_box_awards")
 @Data
@@ -22,56 +22,56 @@ public class BoxAwards implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "AWARDS_ID" , type = IdType.INPUT)
+  @TableId(value = "awards_id" , type = IdType.INPUT)
   private String awardsId;
 
   /**
    * 盲票组ID
    */
-  @TableField("BOX_ID")
+  @TableField("box_id")
   private String boxId;
 
   /**
    * 奖项名
    */
-  @TableField("NAME")
+  @TableField("name")
   private String name;
 
   /**
    * 奖项顺序
    */
-  @TableField("SORT")
+  @TableField("sort")
   private String sort;
 
   /**
    * 奖项数量
    */
-  @TableField("QUANTITY")
+  @TableField("quantity")
   private Integer quantity;
 
   /**
    * 奖项描述
    */
-  @TableField("MEMO")
+  @TableField("memo")
   private String memo;
 
   /**
    * 已兑奖数量
    */
-  @TableField("CASHED_QTY")
+  @TableField("cashed_qty")
   private Integer cashedQty;
 
   /**
    * 创建时间
    */
-  @TableField("CREATED_TIME")
+  @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
-  @TableField("UPDATED_TIME")
+  @TableField("updated_time")
   private Date updatedTime;
 
 
-}
+}

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

@@ -1,4 +1,4 @@
-package com.qs.mp.manager.domain;
+package com.qs.mp.admin.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -11,7 +11,7 @@ import lombok.Data;
 /**
  * @describe 盲票盒奖项对应的奖品设置实体类
  * @auther quanshu
- * @create 2022-02-28 22:58:02
+ * @create 2022-03-02 12:25:55
  */
 @TableName("mp_box_awards_prize")
 @Data
@@ -22,50 +22,50 @@ public class BoxAwardsPrize implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "ID" , type = IdType.AUTO)
+  @TableId(value = "id" , type = IdType.AUTO)
   private Long id;
 
   /**
    * 奖项ID
    */
-  @TableField("AWARDS_ID")
+  @TableField("awards_id")
   private String awardsId;
 
   /**
    * 奖品ID（GOODS_ID或TEMPL_ID)
    */
-  @TableField("PRIZE_ID")
+  @TableField("prize_id")
   private String prizeId;
 
   /**
    * 奖品类型（GOODS或VOUCHER或COIN）
    */
-  @TableField("PRIZE_TYPE")
+  @TableField("prize_type")
   private String prizeType;
 
   /**
    * 奖品数
    */
-  @TableField("QUANTITY")
+  @TableField("quantity")
   private Integer quantity;
 
   /**
    * 已兑奖品数
    */
-  @TableField("CASHED_QTY")
+  @TableField("cashed_qty")
   private Integer cashedQty;
 
   /**
    * 创建时间
    */
-  @TableField("CREATED_TIME")
+  @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
-  @TableField("UPDATED_TIME")
+  @TableField("updated_time")
   private Date updatedTime;
 
 
-}
+}

mp-service/src/main/java/com/qs/mp/manager/domain/Ticket.java → mp-service/src/main/java/com/qs/mp/admin/domain/Ticket.java

@@ -1,4 +1,4 @@
-package com.qs.mp.manager.domain;
+package com.qs.mp.admin.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -11,7 +11,7 @@ import lombok.Data;
 /**
  * @describe 盲票实体类
  * @auther quanshu
- * @create 2022-02-28 22:58:02
+ * @create 2022-03-02 12:25:55
  */
 @TableName("mp_ticket")
 @Data
@@ -22,182 +22,182 @@ public class Ticket implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "TICKET_ID" , type = IdType.INPUT)
+  @TableId(value = "ticket_id" , type = IdType.INPUT)
   private String ticketId;
 
   /**
    * 盲票组ID
    */
-  @TableField("BOX_ID")
+  @TableField("box_id")
   private String boxId;
 
   /**
    * 盲票包ID
    */
-  @TableField("PKG_ID")
+  @TableField("pkg_id")
   private String pkgId;
 
   /**
    * 标题
    */
-  @TableField("TITLE")
+  @TableField("title")
   private String title;
 
   /**
    * 序列号
    */
-  @TableField("SERIAL_NO")
+  @TableField("serial_no")
   private String serialNo;
 
   /**
    * 面值
    */
-  @TableField("FACE_PRICE")
+  @TableField("face_price")
   private Integer facePrice;
 
   /**
    * 加密幸运数字
    */
-  @TableField("CIPHER_LUCKY_NUM")
+  @TableField("cipher_lucky_num")
   private String cipherLuckyNum;
 
   /**
    * 明文幸运数字
    */
-  @TableField("PLAIN_LUCKY_NUM")
+  @TableField("plain_lucky_num")
   private Integer plainLuckyNum;
 
   /**
    * 抽奖数字1描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM1")
+  @TableField("draw_num1")
   private String drawNum1;
 
   /**
    * 抽奖数字2描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM2")
+  @TableField("draw_num2")
   private String drawNum2;
 
   /**
    * 抽奖数字3描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM3")
+  @TableField("draw_num3")
   private String drawNum3;
 
   /**
    * 抽奖数字4描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM4")
+  @TableField("draw_num4")
   private String drawNum4;
 
   /**
    * 抽奖数字5描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM5")
+  @TableField("draw_num5")
   private String drawNum5;
 
   /**
    * 抽奖数字6描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM6")
+  @TableField("draw_num6")
   private String drawNum6;
 
   /**
    * 抽奖数字7描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM7")
+  @TableField("draw_num7")
   private String drawNum7;
 
   /**
    * 抽奖数字8描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM8")
+  @TableField("draw_num8")
   private String drawNum8;
 
   /**
    * 抽奖数字9描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM9")
+  @TableField("draw_num9")
   private String drawNum9;
 
   /**
    * 抽奖数字10描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM10")
+  @TableField("draw_num10")
   private String drawNum10;
 
   /**
    * 抽奖数字11描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM11")
+  @TableField("draw_num11")
   private String drawNum11;
 
   /**
    * 抽奖数字12描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM12")
+  @TableField("draw_num12")
   private String drawNum12;
 
   /**
    * 抽奖数字13描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM13")
+  @TableField("draw_num13")
   private String drawNum13;
 
   /**
    * 抽奖数字14描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM14")
+  @TableField("draw_num14")
   private String drawNum14;
 
   /**
    * 抽奖数字15描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM15")
+  @TableField("draw_num15")
   private String drawNum15;
 
   /**
    * 抽奖数字16描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM16")
+  @TableField("draw_num16")
   private String drawNum16;
 
   /**
    * 抽奖数字17描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM17")
+  @TableField("draw_num17")
   private String drawNum17;
 
   /**
    * 抽奖数字18描述（json格式，包含数字、奖项）
    */
-  @TableField("DRAW_NUM18")
+  @TableField("draw_num18")
   private String drawNum18;
 
   /**
    * 是否实体纸质票（0否1是）
    */
-  @TableField("IS_PHYSICAL")
+  @TableField("is_physical")
   private Integer isPhysical;
 
   /**
    * 盲票状态（初始、已激活、已开奖、已兑奖）
    */
-  @TableField("STATUS")
+  @TableField("status")
   private String status;
 
   /**
    * 创建时间
    */
-  @TableField("CREATED_TIME")
+  @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
-  @TableField("UPDATED_TIME")
+  @TableField("updated_time")
   private Date updatedTime;
 
 
-}
+}

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

@@ -1,4 +1,4 @@
-package com.qs.mp.manager.domain;
+package com.qs.mp.admin.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -12,7 +12,7 @@ import lombok.Data;
 /**
  * @describe 盲票组实体类
  * @auther quanshu
- * @create 2022-03-01 20:33:52
+ * @create 2022-03-02 12:25:55
  */
 @TableName("mp_ticket_box")
 @Data
@@ -23,109 +23,109 @@ public class TicketBox implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "BOX_ID" , type = IdType.INPUT)
+  @TableId(value = "box_id" , type = IdType.INPUT)
   private String boxId;
 
   /**
    * 盲票组标题
    */
-  @TableField("TITLE")
+  @TableField("title")
   private String title;
 
   /**
    * 主图url
    */
-  @TableField("PIC_URL")
+  @TableField("pic_url")
   private String picUrl;
 
   /**
    * 盲票类别
    */
-  @TableField("CATEGORY")
+  @TableField("category")
   private String category;
 
   /**
    * 详细描述
    */
-  @TableField("DESCRIPTION")
+  @TableField("description")
   private String description;
 
   /**
    * 盲票形式（线上或线下）
    */
-  @TableField("TYPE")
+  @TableField("type")
   private String type;
 
   /**
    * 盲票张数
    */
-  @TableField("QUANTITY")
+  @TableField("quantity")
   private Integer quantity;
 
   /**
    * 已售盲票张数
    */
-  @TableField("SALE_QTY")
+  @TableField("sale_qty")
   private Integer saleQty;
 
   /**
    * 盲票包采购单价
    */
-  @TableField("BOX_PRICE")
+  @TableField("box_price")
   private Integer boxPrice;
 
   /**
    * 每包盲票张数
    */
-  @TableField("PKG_UNIT")
+  @TableField("pkg_unit")
   private Integer pkgUnit;
 
   /**
    * 盲票包数
    */
-  @TableField("PKG_QTY")
+  @TableField("pkg_qty")
   private Integer pkgQty;
 
   /**
    * 已销售包数
    */
-  @TableField("SALE_PKG_QTY")
+  @TableField("sale_pkg_qty")
   private Integer salePkgQty;
 
   /**
    * 盲票票面价格
    */
-  @TableField("FACE_PRICE")
+  @TableField("face_price")
   private Integer facePrice;
 
   /**
    * 盲票销售价格
    */
-  @TableField("SALE_PRICE")
+  @TableField("sale_price")
   private Integer salePrice;
 
   /**
    * 分佣的销售额百分比
    */
-  @TableField("SALE_COMM_RATE")
+  @TableField("sale_comm_rate")
   private BigDecimal saleCommRate;
 
   /**
    * 状态，上架/下架
    */
-  @TableField("STATUS")
+  @TableField("status")
   private String status;
 
   /**
    * 创建时间
    */
-  @TableField("CREATED_TIME")
+  @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
-  @TableField("UPDATED_TIME")
+  @TableField("updated_time")
   private Date updatedTime;
 
 

mp-service/src/main/java/com/qs/mp/manager/domain/TicketPackage.java → mp-service/src/main/java/com/qs/mp/admin/domain/TicketPackage.java

@@ -1,4 +1,4 @@
-package com.qs.mp.manager.domain;
+package com.qs.mp.admin.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -11,7 +11,7 @@ import lombok.Data;
 /**
  * @describe 盲票包实体类
  * @auther quanshu
- * @create 2022-02-28 22:58:02
+ * @create 2022-03-02 12:25:55
  */
 @TableName("mp_ticket_package")
 @Data
@@ -22,44 +22,44 @@ public class TicketPackage implements Serializable {
   /**
    * 盲票包ID
    */
-  @TableId(value = "PKG_ID" , type = IdType.INPUT)
+  @TableId(value = "pkg_id" , type = IdType.INPUT)
   private String pkgId;
 
   /**
    * 盲票组ID
    */
-  @TableField("BOX_ID")
+  @TableField("box_id")
   private String boxId;
 
   /**
    * 开始序号
    */
-  @TableField("START_SN")
+  @TableField("start_sn")
   private String startSn;
 
   /**
    * 结束序号
    */
-  @TableField("END_SN")
+  @TableField("end_sn")
   private String endSn;
 
   /**
    * 状态（待销售、已销售）
    */
-  @TableField("STATUS")
+  @TableField("status")
   private String status;
 
   /**
    * 创建时间
    */
-  @TableField("CREATED_TIME")
+  @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
-  @TableField("UPDATED_TIME")
+  @TableField("updated_time")
   private Date updatedTime;
 
 
-}
+}

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

@@ -1,11 +1,11 @@
-package com.qs.mp.manager.mapper;
+package com.qs.mp.admin.mapper;
 
-import com.qs.mp.manager.domain.BoxAwards;
+import com.qs.mp.admin.domain.BoxAwards;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-02-28 22:58:02
+ * @create 2022-03-02 12:25:55
  * @describe 盲票盒奖项设置mapper类
  */
 public interface BoxAwardsMapper extends BaseMapper<BoxAwards> {

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

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

mp-service/src/main/java/com/qs/mp/manager/mapper/TicketBoxMapper.java → mp-service/src/main/java/com/qs/mp/admin/mapper/TicketBoxMapper.java

@@ -1,11 +1,11 @@
-package com.qs.mp.manager.mapper;
+package com.qs.mp.admin.mapper;
 
-import com.qs.mp.manager.domain.TicketBox;
+import com.qs.mp.admin.domain.TicketBox;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-03-01 20:33:52
+ * @create 2022-03-02 12:25:55
  * @describe 盲票组mapper类
  */
 public interface TicketBoxMapper extends BaseMapper<TicketBox> {

mp-service/src/main/java/com/qs/mp/manager/mapper/TicketMapper.java → mp-service/src/main/java/com/qs/mp/admin/mapper/TicketMapper.java

@@ -1,11 +1,11 @@
-package com.qs.mp.manager.mapper;
+package com.qs.mp.admin.mapper;
 
-import com.qs.mp.manager.domain.Ticket;
+import com.qs.mp.admin.domain.Ticket;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-02-28 22:58:02
+ * @create 2022-03-02 12:25:55
  * @describe 盲票mapper类
  */
 public interface TicketMapper extends BaseMapper<Ticket> {

mp-service/src/main/java/com/qs/mp/manager/mapper/TicketPackageMapper.java → mp-service/src/main/java/com/qs/mp/admin/mapper/TicketPackageMapper.java

@@ -1,11 +1,11 @@
-package com.qs.mp.manager.mapper;
+package com.qs.mp.admin.mapper;
 
-import com.qs.mp.manager.domain.TicketPackage;
+import com.qs.mp.admin.domain.TicketPackage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-02-28 22:58:02
+ * @create 2022-03-02 12:25:55
  * @describe 盲票包mapper类
  */
 public interface TicketPackageMapper extends BaseMapper<TicketPackage> {

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

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

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

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

mp-service/src/main/java/com/qs/mp/manager/service/ITicketBoxService.java → mp-service/src/main/java/com/qs/mp/admin/service/ITicketBoxService.java

@@ -1,6 +1,6 @@
-package com.qs.mp.manager.service;
+package com.qs.mp.admin.service;
 
-import com.qs.mp.manager.domain.TicketBox;
+import com.qs.mp.admin.domain.TicketBox;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author quanshu
- * @since 2022-03-01
+ * @since 2022-03-02
  */
 public interface ITicketBoxService extends IService<TicketBox> {
 

mp-service/src/main/java/com/qs/mp/manager/service/ITicketPackageService.java → mp-service/src/main/java/com/qs/mp/admin/service/ITicketPackageService.java

@@ -1,6 +1,6 @@
-package com.qs.mp.manager.service;
+package com.qs.mp.admin.service;
 
-import com.qs.mp.manager.domain.TicketPackage;
+import com.qs.mp.admin.domain.TicketPackage;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 public interface ITicketPackageService extends IService<TicketPackage> {
 

mp-service/src/main/java/com/qs/mp/manager/service/ITicketService.java → mp-service/src/main/java/com/qs/mp/admin/service/ITicketService.java

@@ -1,6 +1,6 @@
-package com.qs.mp.manager.service;
+package com.qs.mp.admin.service;
 
-import com.qs.mp.manager.domain.Ticket;
+import com.qs.mp.admin.domain.Ticket;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 public interface ITicketService extends IService<Ticket> {
 

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

@@ -1,8 +1,8 @@
-package com.qs.mp.manager.service.impl;
+package com.qs.mp.admin.service.impl;
 
-import com.qs.mp.manager.domain.BoxAwardsPrize;
-import com.qs.mp.manager.mapper.BoxAwardsPrizeMapper;
-import com.qs.mp.manager.service.IBoxAwardsPrizeService;
+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;
 
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 @Service
 public class BoxAwardsPrizeServiceImpl extends ServiceImpl<BoxAwardsPrizeMapper, BoxAwardsPrize> implements IBoxAwardsPrizeService {

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

@@ -1,8 +1,8 @@
-package com.qs.mp.manager.service.impl;
+package com.qs.mp.admin.service.impl;
 
-import com.qs.mp.manager.domain.BoxAwards;
-import com.qs.mp.manager.mapper.BoxAwardsMapper;
-import com.qs.mp.manager.service.IBoxAwardsService;
+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;
 
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 @Service
 public class BoxAwardsServiceImpl extends ServiceImpl<BoxAwardsMapper, BoxAwards> implements IBoxAwardsService {

mp-service/src/main/java/com/qs/mp/manager/service/impl/TicketBoxServiceImpl.java → mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -1,8 +1,8 @@
-package com.qs.mp.manager.service.impl;
+package com.qs.mp.admin.service.impl;
 
-import com.qs.mp.manager.domain.TicketBox;
-import com.qs.mp.manager.mapper.TicketBoxMapper;
-import com.qs.mp.manager.service.ITicketBoxService;
+import com.qs.mp.admin.domain.TicketBox;
+import com.qs.mp.admin.mapper.TicketBoxMapper;
+import com.qs.mp.admin.service.ITicketBoxService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-03-01
+ * @since 2022-03-02
  */
 @Service
 public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox> implements ITicketBoxService {

mp-service/src/main/java/com/qs/mp/manager/service/impl/TicketPackageServiceImpl.java → mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketPackageServiceImpl.java

@@ -1,8 +1,8 @@
-package com.qs.mp.manager.service.impl;
+package com.qs.mp.admin.service.impl;
 
-import com.qs.mp.manager.domain.TicketPackage;
-import com.qs.mp.manager.mapper.TicketPackageMapper;
-import com.qs.mp.manager.service.ITicketPackageService;
+import com.qs.mp.admin.domain.TicketPackage;
+import com.qs.mp.admin.mapper.TicketPackageMapper;
+import com.qs.mp.admin.service.ITicketPackageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 @Service
 public class TicketPackageServiceImpl extends ServiceImpl<TicketPackageMapper, TicketPackage> implements ITicketPackageService {

mp-service/src/main/java/com/qs/mp/manager/service/impl/TicketServiceImpl.java → mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketServiceImpl.java

@@ -1,8 +1,8 @@
-package com.qs.mp.manager.service.impl;
+package com.qs.mp.admin.service.impl;
 
-import com.qs.mp.manager.domain.Ticket;
-import com.qs.mp.manager.mapper.TicketMapper;
-import com.qs.mp.manager.service.ITicketService;
+import com.qs.mp.admin.domain.Ticket;
+import com.qs.mp.admin.mapper.TicketMapper;
+import com.qs.mp.admin.service.ITicketService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 @Service
 public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> implements ITicketService {

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

@@ -1,5 +1,7 @@
 package com.qs.mp.channel.domain;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -14,7 +16,7 @@ import lombok.Data;
 /**
  * @describe 渠道经销商实体类
  * @auther quanshu
- * @create 2022-02-28 22:54:23
+ * @create 2022-03-02 12:22:24
  */
 @TableName("mp_channel")
 @Data
@@ -25,133 +27,135 @@ public class Channel implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "ID" , type = IdType.AUTO)
-  private Long id;
+  @TableId(value = "channel_id" , type = IdType.AUTO)
+  private Long channelId;
 
   /**
    * 渠道编码
    */
-  @TableField("CHANNEL_NO")
+  @TableField("channel_no")
   private String channelNo;
 
   /**
    * 渠道名称
    */
-  @TableField("NAME")
+  @TableField("name")
   private String name;
 
   /**
    * 父渠道ID
    */
-  @TableField("PARENT_ID")
+  @TableField("parent_id")
   private Long parentId;
 
   /**
    * 渠道级别，0:经销商；1:一级渠道；2:二级渠道
    */
-  @TableField("LEVEL")
+  @TableField("level")
   private Integer level;
 
   /**
    * 分佣百分比
    */
-  @TableField("COMM_RATE")
+  @TableField("comm_rate")
   private BigDecimal commRate;
 
   /**
    * 省份
    */
-  @TableField("PROVINCE")
+  @TableField("province")
   private String province;
 
   /**
    * 市
    */
-  @TableField("CITY")
+  @TableField("city")
   private String city;
 
   /**
    * 区
    */
-  @TableField("AREA")
+  @TableField("area")
   private String area;
 
   /**
    * 详细地址
    */
-  @TableField("ADDRESS")
+  @TableField("address")
   private String address;
 
   /**
    * 联系人
    */
-  @TableField("CONTACT")
+  @TableField("contact")
   private String contact;
 
   /**
    * 手机号
    */
-  @TableField("MOBILE")
+  @TableField("mobile")
   private String mobile;
 
   /**
    * 用户ID
    */
-  @TableField("USER_ID")
+  @TableField("user_id")
   private Long userId;
 
   /**
    * 账户余额
    */
-  @TableField("MONEY")
+  @TableField("money")
   private Integer money;
 
   /**
    * 账户冻结金额
    */
-  @TableField("FROZEN_MONEY")
+  @TableField("frozen_money")
   private Integer frozenMoney;
 
   /**
-   * 认证状态
+   * 认证状态，未认证n，已认证y
    */
-  @TableField("CERTIFY_STATUS")
+  @TableField("certify_status")
+  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private ChannelCertifyStatusEnum certifyStatus;
 
   /**
    * 审核状态
    */
-  @TableField("VERIFY_STATUS")
+  @TableField("verify_status")
+  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private ChannelVerifyStatusEnum verifyStatus;
 
   /**
    * 营业执照
    */
-  @TableField("BIZ_LICENSE")
+  @TableField("biz_license")
   private String bizLicense;
 
   /**
    * 门头照片
    */
-  @TableField("DOOR_PIC")
+  @TableField("door_pic")
   private String doorPic;
 
   /**
    * 备注信息
    */
-  @TableField("MEMO")
+  @TableField("memo")
   private String memo;
 
   /**
    * 创建时间
    */
-  @TableField("CREATED_TIME")
+  @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
-  @TableField("UPDATED_TIME")
+  @TableField("updated_time")
   private Date updatedTime;
 
 

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

@@ -0,0 +1,125 @@
+package com.qs.mp.channel.domain;
+
+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 java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * @describe 用户配送地址实体类
+ * @auther quanshu
+ * @create 2022-03-02 13:57:20
+ */
+@TableName("mp_channel_addr")
+@Data
+public class ChannelAddr implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * ID
+   */
+  @TableId(value = "addr_id" , type = IdType.AUTO)
+  private Long addrId;
+
+  /**
+   * 渠道ID
+   */
+  @TableField("channel_id")
+  private Long channelId;
+
+  /**
+   * 收货人
+   */
+  @TableField("receiver")
+  private String receiver;
+
+  /**
+   * 省ID
+   */
+  @TableField("province_id")
+  private Long provinceId;
+
+  /**
+   * 省
+   */
+  @TableField("province")
+  private String province;
+
+  /**
+   * 城市
+   */
+  @TableField("city")
+  private String city;
+
+  /**
+   * 城市ID
+   */
+  @TableField("city_id")
+  private Long cityId;
+
+  /**
+   * 区
+   */
+  @TableField("area")
+  private String area;
+
+  /**
+   * 区ID
+   */
+  @TableField("area_id")
+  private Long areaId;
+
+  /**
+   * 邮编
+   */
+  @TableField("post_code")
+  private String postCode;
+
+  /**
+   * 地址
+   */
+  @TableField("addr")
+  private String addr;
+
+  /**
+   * 手机
+   */
+  @TableField("mobile")
+  private String mobile;
+
+  /**
+   * 状态,1正常，0无效
+   */
+  @TableField("status")
+  private Integer status;
+
+  /**
+   * 是否默认地址 1是
+   */
+  @TableField("common_addr")
+  private Integer commonAddr;
+
+  /**
+   * 建立时间
+   */
+  @TableField("create_time")
+  private Date createTime;
+
+  /**
+   * 版本号
+   */
+  @TableField("version")
+  private Integer version;
+
+  /**
+   * 更新时间
+   */
+  @TableField("update_time")
+  private Date updateTime;
+
+
+}

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

@@ -11,7 +11,7 @@ import lombok.Data;
 /**
  * @describe 经销商购物车实体类
  * @auther quanshu
- * @create 2022-02-28 22:54:23
+ * @create 2022-03-02 12:22:24
  */
 @TableName("mp_channel_cart")
 @Data
@@ -22,38 +22,38 @@ public class ChannelCart implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "ID" , type = IdType.AUTO)
+  @TableId(value = "id" , type = IdType.AUTO)
   private Long id;
 
   /**
    * 渠道ID
    */
-  @TableField("CHANNEL_ID")
+  @TableField("channel_id")
   private Long channelId;
 
   /**
    * 盲票组ID
    */
-  @TableField("BOX_ID")
+  @TableField("box_id")
   private Integer boxId;
 
   /**
    * 订购包数
    */
-  @TableField("PKG_NUM")
+  @TableField("pkg_num")
   private Integer pkgNum;
 
   /**
    * 创建时间
    */
-  @TableField("CREATED_TIME")
+  @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
-  @TableField("UPDATED_TIME")
+  @TableField("updated_time")
   private Date updatedTime;
 
 
-}
+}

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

@@ -12,7 +12,7 @@ import lombok.Data;
 /**
  * @describe 渠道佣金记录实体类
  * @auther quanshu
- * @create 2022-02-28 22:54:23
+ * @create 2022-03-02 12:22:24
  */
 @TableName("mp_channel_commission")
 @Data
@@ -23,74 +23,74 @@ public class ChannelCommission implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "ID" , type = IdType.AUTO)
+  @TableId(value = "id" , type = IdType.AUTO)
   private Long id;
 
   /**
    * 渠道ID
    */
-  @TableField("CHANNEL_ID")
+  @TableField("channel_id")
   private Long channelId;
 
   /**
    * 渠道编号
    */
-  @TableField("CHANNEL_NO")
+  @TableField("channel_no")
   private String channelNo;
 
   /**
    * 用户订单ID
    */
-  @TableField("ORDER_ID")
+  @TableField("order_id")
   private String orderId;
 
   /**
    * 盲票ID
    */
-  @TableField("TICKET_ID")
+  @TableField("ticket_id")
   private String ticketId;
 
   /**
    * 销售金额
    */
-  @TableField("SALE_PRICE")
+  @TableField("sale_price")
   private Integer salePrice;
 
   /**
    * 参与分佣的销售金额比例
    */
-  @TableField("SALE_COMM_RATE")
+  @TableField("sale_comm_rate")
   private Integer saleCommRate;
 
   /**
    * 参与分佣的销售金额
    */
-  @TableField("SALE_COMM_AMT")
+  @TableField("sale_comm_amt")
   private Integer saleCommAmt;
 
   /**
    * 佣金比例
    */
-  @TableField("COMM_RATE")
+  @TableField("comm_rate")
   private BigDecimal commRate;
 
   /**
    * 佣金金额
    */
-  @TableField("COMM_AMT")
+  @TableField("comm_amt")
   private Integer commAmt;
 
   /**
    * 创建时间
    */
-  @TableField("CREATED_TIME")
+  @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
-  @TableField("UPDATED_TIME")
+  @TableField("updated_time")
   private Date updatedTime;
 
 
-}
+}

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

@@ -11,7 +11,7 @@ import lombok.Data;
 /**
  * @describe 渠道账户流水实体类
  * @auther quanshu
- * @create 2022-02-28 22:54:23
+ * @create 2022-03-02 12:22:24
  */
 @TableName("mp_channel_money_log")
 @Data
@@ -22,74 +22,74 @@ public class ChannelMoneyLog implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "ID" , type = IdType.AUTO)
+  @TableId(value = "id" , type = IdType.AUTO)
   private Long id;
 
   /**
    * 渠道ID
    */
-  @TableField("CHANNEL_ID")
+  @TableField("channel_id")
   private Long channelId;
 
   /**
    * 交易类型
    */
-  @TableField("TYPE")
+  @TableField("type")
   private Integer type;
 
   /**
    * 交易后账户余额
    */
-  @TableField("MONEY")
+  @TableField("money")
   private Integer money;
 
   /**
    * 账户增减金额
    */
-  @TableField("LOG_MONEY")
+  @TableField("log_money")
   private Integer logMoney;
 
   /**
    * 收支类型
    */
-  @TableField("INCOME_EXPENSE")
+  @TableField("income_expense")
   private Integer incomeExpense;
 
   /**
    * 备注
    */
-  @TableField("LOG_TEXT")
+  @TableField("log_text")
   private String logText;
 
   /**
    * 交易时间
    */
-  @TableField("BIZ_TIME")
+  @TableField("biz_time")
   private Date bizTime;
 
   /**
    * 关联交易ID类型
    */
-  @TableField("REF_TYPE")
+  @TableField("ref_type")
   private Integer refType;
 
   /**
    * 关联交易ID
    */
-  @TableField("REF_ID")
+  @TableField("ref_id")
   private String refId;
 
   /**
    * 创建时间
    */
-  @TableField("CREATED_TIME")
+  @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
-  @TableField("UPDATED_TIME")
+  @TableField("updated_time")
   private Date updatedTime;
 
 
-}
+}

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

@@ -11,7 +11,7 @@ import lombok.Data;
 /**
  * @describe 经销商盲票采购订单实体类
  * @auther quanshu
- * @create 2022-03-01 20:07:00
+ * @create 2022-03-02 12:22:24
  */
 @TableName("mp_channel_order")
 @Data
@@ -22,109 +22,109 @@ public class ChannelOrder implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "ORDER_ID" , type = IdType.INPUT)
+  @TableId(value = "order_id" , type = IdType.INPUT)
   private String orderId;
 
   /**
    * 渠道ID
    */
-  @TableField("CHANNEL_ID")
+  @TableField("channel_id")
   private Long channelId;
 
   /**
    * 标题
    */
-  @TableField("TITLE")
+  @TableField("title")
   private String title;
 
   /**
    * 订单金额
    */
-  @TableField("ORDER_AMT")
+  @TableField("order_amt")
   private Integer orderAmt;
 
   /**
    * 运费金额
    */
-  @TableField("FREIGHT_AMT")
+  @TableField("freight_amt")
   private Integer freightAmt;
 
   /**
    * 实付金额
    */
-  @TableField("PAY_AMT")
+  @TableField("pay_amt")
   private Integer payAmt;
 
   /**
    * 订单状态
    */
-  @TableField("STATUS")
+  @TableField("status")
   private String status;
 
   /**
    * 备注
    */
-  @TableField("MEMO")
+  @TableField("memo")
   private String memo;
 
   /**
    * 收货人
    */
-  @TableField("RECEIVER")
+  @TableField("receiver")
   private String receiver;
 
   /**
    * 收货人电话
    */
-  @TableField("TEL")
+  @TableField("tel")
   private String tel;
 
   /**
    * 收货地址-省
    */
-  @TableField("PROVINCE")
+  @TableField("province")
   private String province;
 
   /**
    * 收货地址-市
    */
-  @TableField("CITY")
+  @TableField("city")
   private String city;
 
   /**
    * 收货地址-区
    */
-  @TableField("AREA")
+  @TableField("area")
   private String area;
 
   /**
    * 收货地址-详细
    */
-  @TableField("ADDRESS")
+  @TableField("address")
   private String address;
 
   /**
    * 物流ID
    */
-  @TableField("DELIVERY_ID")
+  @TableField("delivery_id")
   private String deliveryId;
 
   /**
    * 物流单号
    */
-  @TableField("DELIVERY_FLOW_ID")
+  @TableField("delivery_flow_id")
   private String deliveryFlowId;
 
   /**
    * 创建时间
    */
-  @TableField("CREATED_TIME")
+  @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
-  @TableField("UPDATED_TIME")
+  @TableField("updated_time")
   private Date updatedTime;
 
 

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

@@ -11,7 +11,7 @@ import lombok.Data;
 /**
  * @describe 经销商采购订单盲票包明细实体类
  * @auther quanshu
- * @create 2022-02-28 22:54:23
+ * @create 2022-03-02 12:22:24
  */
 @TableName("mp_channel_order_detail")
 @Data
@@ -22,56 +22,56 @@ public class ChannelOrderDetail implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "ID" , type = IdType.AUTO)
+  @TableId(value = "id" , type = IdType.AUTO)
   private Long id;
 
   /**
    * 订单ID
    */
-  @TableField("ORDER_ID")
+  @TableField("order_id")
   private String orderId;
 
   /**
    * 渠道ID
    */
-  @TableField("CHANNEL_ID")
+  @TableField("channel_id")
   private Long channelId;
 
   /**
    * 盲票组ID
    */
-  @TableField("BOX_ID")
+  @TableField("box_id")
   private String boxId;
 
   /**
    * 盲票包ID
    */
-  @TableField("PKG_ID")
+  @TableField("pkg_id")
   private String pkgId;
 
   /**
    * 起始序号
    */
-  @TableField("START_SN")
+  @TableField("start_sn")
   private String startSn;
 
   /**
    * 结束序号
    */
-  @TableField("END_SN")
+  @TableField("end_sn")
   private String endSn;
 
   /**
    * 创建时间
    */
-  @TableField("CREATED_TIME")
+  @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
-  @TableField("UPDATED_TIME")
+  @TableField("updated_time")
   private Date updatedTime;
 
 
-}
+}

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

@@ -0,0 +1,83 @@
+package com.qs.mp.channel.domain;
+
+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 java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * @describe 经销商盲票采购订单明细实体类
+ * @auther quanshu
+ * @create 2022-03-02 12:22:24
+ */
+@TableName("mp_channel_order_item")
+@Data
+public class ChannelOrderItem implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 主键
+   */
+  @TableId(value = "id" , type = IdType.AUTO)
+  private Long id;
+
+  /**
+   * 订单ID
+   */
+  @TableField("order_id")
+  private String orderId;
+
+  /**
+   * 渠道ID
+   */
+  @TableField("channel_id")
+  private Long channelId;
+
+  /**
+   * 盲票组标题
+   */
+  @TableField("title")
+  private String title;
+
+  /**
+   * 盲票组主图
+   */
+  @TableField("pic_url")
+  private String picUrl;
+
+  /**
+   * 盲票组ID
+   */
+  @TableField("box_id")
+  private String boxId;
+
+  /**
+   * 盲票包数量
+   */
+  @TableField("pkg_num")
+  private Integer pkgNum;
+
+  /**
+   * 盲票包单价
+   */
+  @TableField("pkg_price")
+  private Integer pkgPrice;
+
+  /**
+   * 创建时间
+   */
+  @TableField("created_time")
+  private Date createdTime;
+
+  /**
+   * 更新时间
+   */
+  @TableField("updated_time")
+  private Date updatedTime;
+
+
+}

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

@@ -11,49 +11,49 @@ import lombok.Data;
 /**
  * @describe 经销商的用户实体类
  * @auther quanshu
- * @create 2022-02-28 22:55:41
+ * @create 2022-03-02 12:23:22
  */
-@TableName("mp_channel_user")
+@TableName("mp_channel_user_rel")
 @Data
-public class ChannelUser implements Serializable {
+public class ChannelUserRel implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
   /**
    * 主键
    */
-  @TableId(value = "ID" , type = IdType.AUTO)
+  @TableId(value = "id" , type = IdType.AUTO)
   private Long id;
 
   /**
    * 渠道ID
    */
-  @TableField("CHANNEL_ID")
+  @TableField("channel_id")
   private Long channelId;
 
   /**
    * 渠道编号
    */
-  @TableField("CHANNEL_NO")
+  @TableField("channel_no")
   private String channelNo;
 
   /**
    * 用户ID
    */
-  @TableField("USER_ID")
+  @TableField("user_id")
   private Long userId;
 
   /**
    * 创建时间
    */
-  @TableField("CREATED_TIME")
+  @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
-  @TableField("UPDATED_TIME")
+  @TableField("updated_time")
   private Date updatedTime;
 
 
-}
+}

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

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
+ *
+ * https://www.mall4j.com/
+ *
+ * 未经允许，不可做商业用途！
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.qs.mp.channel.domain.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+@ApiModel(value= "地址参数")
+@Data
+public class AddrParam {
+
+	@ApiModelProperty(value = "地址ID",required=true)
+	private Long addrId;
+
+	@NotNull(message = "收货人不能为空")
+	@ApiModelProperty(value = "收货人",required=true)
+	private String receiver;
+
+	@NotNull(message = "地址不能为空")
+	@ApiModelProperty(value = "地址",required=true)
+	private String addr;
+
+	@ApiModelProperty(value = "邮编",required=false)
+	private String postCode;
+
+	@NotNull(message = "手机不能为空")
+	@ApiModelProperty(value = "手机",required=true)
+	private String mobile;
+
+	@NotNull(message = "省ID不能为空")
+	@ApiModelProperty(value = "省ID",required=true)
+	private Long provinceId;
+
+	@NotNull(message = "城市ID不能为空")
+	@ApiModelProperty(value = "城市ID",required=true)
+	private Long cityId;
+
+	@NotNull(message = "区ID不能为空")
+	@ApiModelProperty(value = "区ID",required=true)
+	private Long areaId;
+
+	@NotNull(message = "省不能为空")
+	@ApiModelProperty(value = "省",required=true)
+	private String province;
+
+	@NotNull(message = "城市不能为空")
+	@ApiModelProperty(value = "城市",required=true)
+	private String city;
+
+	@NotNull(message = "区不能为空")
+	@ApiModelProperty(value = "区",required=true)
+	private String area;
+
+}

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelAddrMapper.java

@@ -0,0 +1,13 @@
+package com.qs.mp.channel.mapper;
+
+import com.qs.mp.channel.domain.ChannelAddr;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @auther quanshu
+ * @create 2022-03-02 13:57:20
+ * @describe 用户配送地址mapper类
+ */
+public interface ChannelAddrMapper extends BaseMapper<ChannelAddr> {
+
+}

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelCartMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-02-28 22:54:23
+ * @create 2022-03-02 12:22:24
  * @describe 经销商购物车mapper类
  */
 public interface ChannelCartMapper extends BaseMapper<ChannelCart> {

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelCommissionMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-02-28 22:54:23
+ * @create 2022-03-02 12:22:24
  * @describe 渠道佣金记录mapper类
  */
 public interface ChannelCommissionMapper extends BaseMapper<ChannelCommission> {

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-02-28 22:54:23
+ * @create 2022-03-02 12:22:24
  * @describe 渠道经销商mapper类
  */
 public interface ChannelMapper extends BaseMapper<Channel> {

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelMoneyLogMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-02-28 22:54:23
+ * @create 2022-03-02 12:22:24
  * @describe 渠道账户流水mapper类
  */
 public interface ChannelMoneyLogMapper extends BaseMapper<ChannelMoneyLog> {

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelOrderDetailMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-02-28 22:54:23
+ * @create 2022-03-02 12:22:24
  * @describe 经销商采购订单盲票包明细mapper类
  */
 public interface ChannelOrderDetailMapper extends BaseMapper<ChannelOrderDetail> {

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelOrderItemMapper.java

@@ -0,0 +1,13 @@
+package com.qs.mp.channel.mapper;
+
+import com.qs.mp.channel.domain.ChannelOrderItem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @auther quanshu
+ * @create 2022-03-02 12:22:24
+ * @describe 经销商盲票采购订单明细mapper类
+ */
+public interface ChannelOrderItemMapper extends BaseMapper<ChannelOrderItem> {
+
+}

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelOrderMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-03-01 20:07:00
+ * @create 2022-03-02 12:22:24
  * @describe 经销商盲票采购订单mapper类
  */
 public interface ChannelOrderMapper extends BaseMapper<ChannelOrder> {

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelUserMapper.java → mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelUserRelMapper.java

@@ -1,13 +1,13 @@
 package com.qs.mp.channel.mapper;
 
-import com.qs.mp.channel.domain.ChannelUser;
+import com.qs.mp.channel.domain.ChannelUserRel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @auther quanshu
- * @create 2022-02-28 22:55:41
+ * @create 2022-03-02 12:23:22
  * @describe 经销商的用户mapper类
  */
-public interface ChannelUserMapper extends BaseMapper<ChannelUser> {
+public interface ChannelUserRelMapper extends BaseMapper<ChannelUserRel> {
 
 }

mp-service/src/main/java/com/qs/mp/channel/service/IChannelAddrService.java

@@ -0,0 +1,22 @@
+package com.qs.mp.channel.service;
+
+import com.qs.mp.channel.domain.ChannelAddr;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 渠道配送地址 服务类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-02
+ */
+public interface IChannelAddrService extends IService<ChannelAddr> {
+  ChannelAddr getDefaultChannelAddr(Long channelId);
+
+  boolean updateDefaultChannelAddr(Long addrId, Long channelId);
+
+  boolean removeChannelAddrByUserId(Long addrId, Long channelId);
+
+  ChannelAddr getChannelAddrByUserId(Long addrId, Long channelId);
+}

mp-service/src/main/java/com/qs/mp/channel/service/IChannelCartService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 public interface IChannelCartService extends IService<ChannelCart> {
 

mp-service/src/main/java/com/qs/mp/channel/service/IChannelCommissionService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 public interface IChannelCommissionService extends IService<ChannelCommission> {
 

mp-service/src/main/java/com/qs/mp/channel/service/IChannelMoneyLogService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 public interface IChannelMoneyLogService extends IService<ChannelMoneyLog> {
 

mp-service/src/main/java/com/qs/mp/channel/service/IChannelOrderDetailService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 public interface IChannelOrderDetailService extends IService<ChannelOrderDetail> {
 

mp-service/src/main/java/com/qs/mp/channel/service/IChannelOrderItemService.java

@@ -0,0 +1,16 @@
+package com.qs.mp.channel.service;
+
+import com.qs.mp.channel.domain.ChannelOrderItem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 经销商盲票采购订单明细 服务类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-02
+ */
+public interface IChannelOrderItemService extends IService<ChannelOrderItem> {
+
+}

mp-service/src/main/java/com/qs/mp/channel/service/IChannelOrderService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author quanshu
- * @since 2022-03-01
+ * @since 2022-03-02
  */
 public interface IChannelOrderService extends IService<ChannelOrder> {
 

mp-service/src/main/java/com/qs/mp/channel/service/IChannelService.java

@@ -9,17 +9,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 public interface IChannelService extends IService<Channel> {
-	
-	
-
-    /**
-     * 登录的时候根据userid查询Channel信息
-     * @param userId
-     * @return
-     */
-    public Channel getChannelByUserId(long userId);
 
+  /**
+   * 根据用户ID查询渠道
+   * @param userId
+   * @return
+   */
+  Channel getChannelByUserId(Long userId);
 }

mp-service/src/main/java/com/qs/mp/channel/service/IChannelUserService.java → mp-service/src/main/java/com/qs/mp/channel/service/IChannelUserRelService.java

@@ -1,6 +1,6 @@
 package com.qs.mp.channel.service;
 
-import com.qs.mp.channel.domain.ChannelUser;
+import com.qs.mp.channel.domain.ChannelUserRel;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
-public interface IChannelUserService extends IService<ChannelUser> {
+public interface IChannelUserRelService extends IService<ChannelUserRel> {
 
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelAddrServiceImpl.java

@@ -0,0 +1,45 @@
+package com.qs.mp.channel.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.qs.mp.channel.domain.ChannelAddr;
+import com.qs.mp.channel.mapper.ChannelAddrMapper;
+import com.qs.mp.channel.service.IChannelAddrService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 渠道配送地址 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-02
+ */
+@Service
+public class ChannelAddrServiceImpl extends ServiceImpl<ChannelAddrMapper, ChannelAddr> implements IChannelAddrService {
+
+  @Override
+  public ChannelAddr getDefaultChannelAddr(Long channelId) {
+    return getOne(new LambdaQueryWrapper<ChannelAddr>().eq(ChannelAddr::getChannelId, channelId)
+        .eq(ChannelAddr::getCommonAddr, 1));
+  }
+
+  @Override
+  public boolean updateDefaultChannelAddr(Long addrId, Long channelId) {
+    return update(new LambdaUpdateWrapper<ChannelAddr>().set(ChannelAddr::getCommonAddr, 1)
+        .eq(ChannelAddr::getChannelId, channelId).eq(ChannelAddr::getAddrId, addrId));
+  }
+
+  @Override
+  public boolean removeChannelAddrByUserId(Long addrId, Long channelId) {
+    return remove(new LambdaQueryWrapper<ChannelAddr>()
+        .eq(ChannelAddr::getChannelId, channelId).eq(ChannelAddr::getAddrId, addrId));
+  }
+
+  @Override
+  public ChannelAddr getChannelAddrByUserId(Long addrId, Long channelId) {
+    return getOne(new LambdaQueryWrapper<ChannelAddr>()
+        .eq(ChannelAddr::getChannelId, channelId).eq(ChannelAddr::getAddrId, addrId));
+  }
+}

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelCartServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 @Service
 public class ChannelCartServiceImpl extends ServiceImpl<ChannelCartMapper, ChannelCart> implements IChannelCartService {

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelCommissionServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 @Service
 public class ChannelCommissionServiceImpl extends ServiceImpl<ChannelCommissionMapper, ChannelCommission> implements IChannelCommissionService {

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelMoneyLogServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 @Service
 public class ChannelMoneyLogServiceImpl extends ServiceImpl<ChannelMoneyLogMapper, ChannelMoneyLog> implements IChannelMoneyLogService {

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderDetailServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 @Service
 public class ChannelOrderDetailServiceImpl extends ServiceImpl<ChannelOrderDetailMapper, ChannelOrderDetail> implements IChannelOrderDetailService {

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderItemServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qs.mp.channel.service.impl;
+
+import com.qs.mp.channel.domain.ChannelOrderItem;
+import com.qs.mp.channel.mapper.ChannelOrderItemMapper;
+import com.qs.mp.channel.service.IChannelOrderItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 经销商盲票采购订单明细 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-02
+ */
+@Service
+public class ChannelOrderItemServiceImpl extends ServiceImpl<ChannelOrderItemMapper, ChannelOrderItem> implements IChannelOrderItemService {
+
+}

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-03-01
+ * @since 2022-03-02
  */
 @Service
 public class ChannelOrderServiceImpl extends ServiceImpl<ChannelOrderMapper, ChannelOrder> implements IChannelOrderService {

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelServiceImpl.java

@@ -1,9 +1,9 @@
 package com.qs.mp.channel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.mapper.ChannelMapper;
 import com.qs.mp.channel.service.IChannelService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -13,14 +13,13 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author quanshu
- * @since 2022-02-28
+ * @since 2022-03-02
  */
 @Service
 public class ChannelServiceImpl extends ServiceImpl<ChannelMapper, Channel> implements IChannelService {
 
-	
-	@Override
-	public Channel getChannelByUserId(long userId) {
-		return getOne(new QueryWrapper<Channel>().lambda().eq(Channel::getUserId, userId));
-	}
+  @Override
+  public Channel getChannelByUserId(Long userId) {
+    return getBaseMapper().selectOne(new LambdaQueryWrapper<Channel>().eq(Channel::getUserId, userId));
+  }
 }

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelUserRelServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qs.mp.channel.service.impl;
+
+import com.qs.mp.channel.domain.ChannelUserRel;
+import com.qs.mp.channel.mapper.ChannelUserRelMapper;
+import com.qs.mp.channel.service.IChannelUserRelService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 经销商的用户 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-02
+ */
+@Service
+public class ChannelUserRelServiceImpl extends ServiceImpl<ChannelUserRelMapper, ChannelUserRel> implements IChannelUserRelService {
+
+}

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelUserServiceImpl.java

@@ -1,20 +0,0 @@
-package com.qs.mp.channel.service.impl;
-
-import com.qs.mp.channel.domain.ChannelUser;
-import com.qs.mp.channel.mapper.ChannelUserMapper;
-import com.qs.mp.channel.service.IChannelUserService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 经销商的用户 服务实现类
- * </p>
- *
- * @author quanshu
- * @since 2022-02-28
- */
-@Service
-public class ChannelUserServiceImpl extends ServiceImpl<ChannelUserMapper, ChannelUser> implements IChannelUserService {
-
-}

mp-service/src/main/java/com/qs/mp/common/domain/Area.java

@@ -0,0 +1,34 @@
+package com.qs.mp.common.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+/**
+ * @describe 实体类
+ * @auther quanshu
+ * @create 2022-03-02 11:23:04
+ */
+@TableName("mp_area")
+@Data
+public class Area implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "area_id", type = IdType.AUTO)
+    private Long areaId;
+
+    @TableField("area_name")
+    private String areaName;
+
+    @TableField("parent_id")
+    private Long parentId;
+
+    @TableField("level")
+    private Integer level;
+
+
+}

mp-service/src/main/java/com/qs/mp/common/mapper/AreaMapper.java

@@ -0,0 +1,13 @@
+package com.qs.mp.common.mapper;
+
+import com.qs.mp.common.domain.Area;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @auther quanshu
+ * @create 2022-03-02 11:23:04
+ * @describe mapper类
+ */
+public interface AreaMapper extends BaseMapper<Area> {
+
+}

mp-service/src/main/java/com/qs/mp/common/service/IAreaService.java

@@ -0,0 +1,23 @@
+package com.qs.mp.common.service;
+
+import com.qs.mp.common.domain.Area;
+import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-02
+ */
+public interface IAreaService extends IService<Area> {
+  /**
+   * 通过pid 查找地址接口
+   *
+   * @param pid 父id
+   * @return
+   */
+  List<Area> listByPid(Long pid);
+}

mp-service/src/main/java/com/qs/mp/common/service/impl/AreaServiceImpl.java

@@ -0,0 +1,26 @@
+package com.qs.mp.common.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.qs.mp.common.domain.Area;
+import com.qs.mp.common.mapper.AreaMapper;
+import com.qs.mp.common.service.IAreaService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-02
+ */
+@Service
+public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements IAreaService {
+  @Override
+  public List<Area> listByPid(Long pid) {
+    return getBaseMapper().selectList(new LambdaQueryWrapper<Area>().eq(Area::getParentId, pid));
+  }
+}

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

@@ -0,0 +1,23 @@
+<?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">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.BoxAwards">
+        <id column="awards_id" property="awardsId" />
+        <result column="box_id" property="boxId" />
+        <result column="name" property="name" />
+        <result column="sort" property="sort" />
+        <result column="quantity" property="quantity" />
+        <result column="memo" property="memo" />
+        <result column="cashed_qty" property="cashedQty" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        awards_id, box_id, name, sort, quantity, memo, cashed_qty, created_time, updated_time
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,22 @@
+<?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">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.BoxAwardsPrize">
+        <id column="id" property="id" />
+        <result column="awards_id" property="awardsId" />
+        <result column="prize_id" property="prizeId" />
+        <result column="prize_type" property="prizeType" />
+        <result column="quantity" property="quantity" />
+        <result column="cashed_qty" property="cashedQty" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, awards_id, prize_id, prize_type, quantity, cashed_qty, created_time, updated_time
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,32 @@
+<?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.TicketBoxMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.TicketBox">
+        <id column="box_id" property="boxId" />
+        <result column="title" property="title" />
+        <result column="pic_url" property="picUrl" />
+        <result column="category" property="category" />
+        <result column="description" property="description" />
+        <result column="type" property="type" />
+        <result column="quantity" property="quantity" />
+        <result column="sale_qty" property="saleQty" />
+        <result column="box_price" property="boxPrice" />
+        <result column="pkg_unit" property="pkgUnit" />
+        <result column="pkg_qty" property="pkgQty" />
+        <result column="sale_pkg_qty" property="salePkgQty" />
+        <result column="face_price" property="facePrice" />
+        <result column="sale_price" property="salePrice" />
+        <result column="sale_comm_rate" property="saleCommRate" />
+        <result column="status" property="status" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        box_id, title, pic_url, category, description, type, quantity, sale_qty, box_price, pkg_unit, pkg_qty, sale_pkg_qty, face_price, sale_price, sale_comm_rate, status, created_time, updated_time
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,44 @@
+<?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.TicketMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.Ticket">
+        <id column="ticket_id" property="ticketId" />
+        <result column="box_id" property="boxId" />
+        <result column="pkg_id" property="pkgId" />
+        <result column="title" property="title" />
+        <result column="serial_no" property="serialNo" />
+        <result column="face_price" property="facePrice" />
+        <result column="cipher_lucky_num" property="cipherLuckyNum" />
+        <result column="plain_lucky_num" property="plainLuckyNum" />
+        <result column="draw_num1" property="drawNum1" />
+        <result column="draw_num2" property="drawNum2" />
+        <result column="draw_num3" property="drawNum3" />
+        <result column="draw_num4" property="drawNum4" />
+        <result column="draw_num5" property="drawNum5" />
+        <result column="draw_num6" property="drawNum6" />
+        <result column="draw_num7" property="drawNum7" />
+        <result column="draw_num8" property="drawNum8" />
+        <result column="draw_num9" property="drawNum9" />
+        <result column="draw_num10" property="drawNum10" />
+        <result column="draw_num11" property="drawNum11" />
+        <result column="draw_num12" property="drawNum12" />
+        <result column="draw_num13" property="drawNum13" />
+        <result column="draw_num14" property="drawNum14" />
+        <result column="draw_num15" property="drawNum15" />
+        <result column="draw_num16" property="drawNum16" />
+        <result column="draw_num17" property="drawNum17" />
+        <result column="draw_num18" property="drawNum18" />
+        <result column="is_physical" property="isPhysical" />
+        <result column="status" property="status" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        ticket_id, box_id, pkg_id, title, serial_no, face_price, cipher_lucky_num, plain_lucky_num, draw_num1, draw_num2, draw_num3, draw_num4, draw_num5, draw_num6, draw_num7, draw_num8, draw_num9, draw_num10, draw_num11, draw_num12, draw_num13, draw_num14, draw_num15, draw_num16, draw_num17, draw_num18, is_physical, status, created_time, updated_time
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,21 @@
+<?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.TicketPackageMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.TicketPackage">
+        <id column="pkg_id" property="pkgId" />
+        <result column="box_id" property="boxId" />
+        <result column="start_sn" property="startSn" />
+        <result column="end_sn" property="endSn" />
+        <result column="status" property="status" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        pkg_id, box_id, start_sn, end_sn, status, created_time, updated_time
+    </sql>
+
+</mapper>

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

@@ -0,0 +1,31 @@
+<?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.channel.mapper.ChannelAddrMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.ChannelAddr">
+        <id column="addr_id" property="addrId" />
+        <result column="channel_id" property="channelId" />
+        <result column="receiver" property="receiver" />
+        <result column="province_id" property="provinceId" />
+        <result column="province" property="province" />
+        <result column="city" property="city" />
+        <result column="city_id" property="cityId" />
+        <result column="area" property="area" />
+        <result column="area_id" property="areaId" />
+        <result column="post_code" property="postCode" />
+        <result column="addr" property="addr" />
+        <result column="mobile" property="mobile" />
+        <result column="status" property="status" />
+        <result column="common_addr" property="commonAddr" />
+        <result column="create_time" property="createTime" />
+        <result column="version" property="version" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        addr_id, channel_id, receiver, province_id, province, city, city_id, area, area_id, post_code, addr, mobile, status, common_addr, create_time, version, update_time
+    </sql>
+
+</mapper>

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

@@ -4,17 +4,17 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.ChannelCart">
-        <id column="ID" property="id" />
-        <result column="CHANNEL_ID" property="channelId" />
-        <result column="BOX_ID" property="boxId" />
-        <result column="PKG_NUM" property="pkgNum" />
-        <result column="CREATED_TIME" property="createdTime" />
-        <result column="UPDATED_TIME" property="updatedTime" />
+        <id column="id" property="id" />
+        <result column="channel_id" property="channelId" />
+        <result column="box_id" property="boxId" />
+        <result column="pkg_num" property="pkgNum" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CHANNEL_ID, BOX_ID, PKG_NUM, CREATED_TIME, UPDATED_TIME
+        id, channel_id, box_id, pkg_num, created_time, updated_time
     </sql>
 
 </mapper>

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

@@ -4,23 +4,23 @@
 
     <!-- 通用查询映射结果 -->
     <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" />
-        <result column="SALE_COMM_RATE" property="saleCommRate" />
-        <result column="SALE_COMM_AMT" property="saleCommAmt" />
-        <result column="COMM_RATE" property="commRate" />
-        <result column="COMM_AMT" property="commAmt" />
-        <result column="CREATED_TIME" property="createdTime" />
-        <result column="UPDATED_TIME" property="updatedTime" />
+        <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" />
+        <result column="sale_comm_rate" property="saleCommRate" />
+        <result column="sale_comm_amt" property="saleCommAmt" />
+        <result column="comm_rate" property="commRate" />
+        <result column="comm_amt" property="commAmt" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <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, channel_no, order_id, ticket_id, sale_price, sale_comm_rate, sale_comm_amt, comm_rate, comm_amt, created_time, updated_time
     </sql>
 
 </mapper>

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

@@ -4,33 +4,33 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.Channel">
-        <id column="ID" property="id" />
-        <result column="CHANNEL_NO" property="channelNo" />
-        <result column="NAME" property="name" />
-        <result column="PARENT_ID" property="parentId" />
-        <result column="LEVEL" property="level" />
-        <result column="COMM_RATE" property="commRate" />
-        <result column="PROVINCE" property="province" />
-        <result column="CITY" property="city" />
-        <result column="AREA" property="area" />
-        <result column="ADDRESS" property="address" />
-        <result column="CONTACT" property="contact" />
-        <result column="MOBILE" property="mobile" />
-        <result column="USER_ID" property="userId" />
-        <result column="MONEY" property="money" />
-        <result column="FROZEN_MONEY" property="frozenMoney" />
-        <result column="CERTIFY_STATUS" property="certifyStatus" />
-        <result column="VERIFY_STATUS" property="verifyStatus" />
-        <result column="BIZ_LICENSE" property="bizLicense" />
-        <result column="DOOR_PIC" property="doorPic" />
-        <result column="MEMO" property="memo" />
-        <result column="CREATED_TIME" property="createdTime" />
-        <result column="UPDATED_TIME" property="updatedTime" />
+        <id column="channel_id" property="channelId" />
+        <result column="channel_no" property="channelNo" />
+        <result column="name" property="name" />
+        <result column="parent_id" property="parentId" />
+        <result column="level" property="level" />
+        <result column="comm_rate" property="commRate" />
+        <result column="province" property="province" />
+        <result column="city" property="city" />
+        <result column="area" property="area" />
+        <result column="address" property="address" />
+        <result column="contact" property="contact" />
+        <result column="mobile" property="mobile" />
+        <result column="user_id" property="userId" />
+        <result column="money" property="money" />
+        <result column="frozen_money" property="frozenMoney" />
+        <result column="certify_status" property="certifyStatus" />
+        <result column="verify_status" property="verifyStatus" />
+        <result column="biz_license" property="bizLicense" />
+        <result column="door_pic" property="doorPic" />
+        <result column="memo" property="memo" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CHANNEL_NO, NAME, PARENT_ID, LEVEL, COMM_RATE, PROVINCE, CITY, AREA, ADDRESS, CONTACT, MOBILE, USER_ID, MONEY, FROZEN_MONEY, CERTIFY_STATUS, VERIFY_STATUS, BIZ_LICENSE, DOOR_PIC, MEMO, CREATED_TIME, UPDATED_TIME
+        channel_id, channel_no, name, parent_id, level, comm_rate, province, city, area, address, contact, mobile, user_id, money, frozen_money, certify_status, verify_status, biz_license, door_pic, memo, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>

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

@@ -4,23 +4,23 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.ChannelMoneyLog">
-        <id column="ID" property="id" />
-        <result column="CHANNEL_ID" property="channelId" />
-        <result column="TYPE" property="type" />
-        <result column="MONEY" property="money" />
-        <result column="LOG_MONEY" property="logMoney" />
-        <result column="INCOME_EXPENSE" property="incomeExpense" />
-        <result column="LOG_TEXT" property="logText" />
-        <result column="BIZ_TIME" property="bizTime" />
-        <result column="REF_TYPE" property="refType" />
-        <result column="REF_ID" property="refId" />
-        <result column="CREATED_TIME" property="createdTime" />
-        <result column="UPDATED_TIME" property="updatedTime" />
+        <id column="id" property="id" />
+        <result column="channel_id" property="channelId" />
+        <result column="type" property="type" />
+        <result column="money" property="money" />
+        <result column="log_money" property="logMoney" />
+        <result column="income_expense" property="incomeExpense" />
+        <result column="log_text" property="logText" />
+        <result column="biz_time" property="bizTime" />
+        <result column="ref_type" property="refType" />
+        <result column="ref_id" property="refId" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, CHANNEL_ID, TYPE, MONEY, LOG_MONEY, INCOME_EXPENSE, LOG_TEXT, BIZ_TIME, REF_TYPE, REF_ID, CREATED_TIME, UPDATED_TIME
+        id, channel_id, type, money, log_money, income_expense, log_text, biz_time, ref_type, ref_id, created_time, updated_time
     </sql>
 
 </mapper>

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

@@ -4,20 +4,20 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.ChannelOrderDetail">
-        <id column="ID" property="id" />
-        <result column="ORDER_ID" property="orderId" />
-        <result column="CHANNEL_ID" property="channelId" />
-        <result column="BOX_ID" property="boxId" />
-        <result column="PKG_ID" property="pkgId" />
-        <result column="START_SN" property="startSn" />
-        <result column="END_SN" property="endSn" />
-        <result column="CREATED_TIME" property="createdTime" />
-        <result column="UPDATED_TIME" property="updatedTime" />
+        <id column="id" property="id" />
+        <result column="order_id" property="orderId" />
+        <result column="channel_id" property="channelId" />
+        <result column="box_id" property="boxId" />
+        <result column="pkg_id" property="pkgId" />
+        <result column="start_sn" property="startSn" />
+        <result column="end_sn" property="endSn" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID, ORDER_ID, CHANNEL_ID, BOX_ID, PKG_ID, START_SN, END_SN, CREATED_TIME, UPDATED_TIME
+        id, order_id, channel_id, box_id, pkg_id, start_sn, end_sn, created_time, updated_time
     </sql>
 
 </mapper>

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

@@ -0,0 +1,24 @@
+<?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.channel.mapper.ChannelOrderItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.ChannelOrderItem">
+        <id column="id" property="id" />
+        <result column="order_id" property="orderId" />
+        <result column="channel_id" property="channelId" />
+        <result column="title" property="title" />
+        <result column="pic_url" property="picUrl" />
+        <result column="box_id" property="boxId" />
+        <result column="pkg_num" property="pkgNum" />
+        <result column="pkg_price" property="pkgPrice" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, order_id, channel_id, title, pic_url, box_id, pkg_num, pkg_price, created_time, updated_time
+    </sql>
+
+</mapper>

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

@@ -4,29 +4,29 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.ChannelOrder">
-        <id column="ORDER_ID" property="orderId" />
-        <result column="CHANNEL_ID" property="channelId" />
-        <result column="TITLE" property="title" />
-        <result column="ORDER_AMT" property="orderAmt" />
-        <result column="FREIGHT_AMT" property="freightAmt" />
-        <result column="PAY_AMT" property="payAmt" />
-        <result column="STATUS" property="status" />
-        <result column="MEMO" property="memo" />
-        <result column="RECEIVER" property="receiver" />
-        <result column="TEL" property="tel" />
-        <result column="PROVINCE" property="province" />
-        <result column="CITY" property="city" />
-        <result column="AREA" property="area" />
-        <result column="ADDRESS" property="address" />
-        <result column="DELIVERY_ID" property="deliveryId" />
-        <result column="DELIVERY_FLOW_ID" property="deliveryFlowId" />
-        <result column="CREATED_TIME" property="createdTime" />
-        <result column="UPDATED_TIME" property="updatedTime" />
+        <id column="order_id" property="orderId" />
+        <result column="channel_id" property="channelId" />
+        <result column="title" property="title" />
+        <result column="order_amt" property="orderAmt" />
+        <result column="freight_amt" property="freightAmt" />
+        <result column="pay_amt" property="payAmt" />
+        <result column="status" property="status" />
+        <result column="memo" property="memo" />
+        <result column="receiver" property="receiver" />
+        <result column="tel" property="tel" />
+        <result column="province" property="province" />
+        <result column="city" property="city" />
+        <result column="area" property="area" />
+        <result column="address" property="address" />
+        <result column="delivery_id" property="deliveryId" />
+        <result column="delivery_flow_id" property="deliveryFlowId" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ORDER_ID, CHANNEL_ID, TITLE, ORDER_AMT, FREIGHT_AMT, PAY_AMT, STATUS, MEMO, RECEIVER, TEL, PROVINCE, CITY, AREA, ADDRESS, DELIVERY_ID, DELIVERY_FLOW_ID, CREATED_TIME, UPDATED_TIME
+        order_id, channel_id, title, order_amt, freight_amt, pay_amt, status, memo, receiver, tel, province, city, area, address, delivery_id, delivery_flow_id, created_time, updated_time
     </sql>
 
 </mapper>

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

@@ -1,20 +0,0 @@
-<?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.channel.mapper.ChannelUserMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.ChannelUser">
-        <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" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        ID, CHANNEL_ID, CHANNEL_NO, USER_ID, CREATED_TIME, UPDATED_TIME
-    </sql>
-
-</mapper>

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

@@ -0,0 +1,20 @@
+<?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.channel.mapper.ChannelUserRelMapper">
+
+    <!-- 通用查询映射结果 -->
+    <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" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, channel_id, channel_no, user_id, created_time, updated_time
+    </sql>
+
+</mapper>

mp-service/src/main/resources/mapper/common/AreaMapper.xml

@@ -0,0 +1,18 @@
+<?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.common.mapper.AreaMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.common.domain.Area">
+        <id column="area_id" property="areaId" />
+        <result column="area_name" property="areaName" />
+        <result column="parent_id" property="parentId" />
+        <result column="level" property="level" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        area_id, area_name, parent_id, level
+    </sql>
+
+</mapper>

mp-service/src/main/resources/mapper/manager/BoxAwardsMapper.xml

@@ -1,23 +0,0 @@
-<?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.manager.mapper.BoxAwardsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qs.mp.manager.domain.BoxAwards">
-        <id column="AWARDS_ID" property="awardsId" />
-        <result column="BOX_ID" property="boxId" />
-        <result column="NAME" property="name" />
-        <result column="SORT" property="sort" />
-        <result column="QUANTITY" property="quantity" />
-        <result column="MEMO" property="memo" />
-        <result column="CASHED_QTY" property="cashedQty" />
-        <result column="CREATED_TIME" property="createdTime" />
-        <result column="UPDATED_TIME" property="updatedTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        AWARDS_ID, BOX_ID, NAME, SORT, QUANTITY, MEMO, CASHED_QTY, CREATED_TIME, UPDATED_TIME
-    </sql>
-
-</mapper>

mp-service/src/main/resources/mapper/manager/BoxAwardsPrizeMapper.xml

@@ -1,22 +0,0 @@
-<?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.manager.mapper.BoxAwardsPrizeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qs.mp.manager.domain.BoxAwardsPrize">
-        <id column="ID" property="id" />
-        <result column="AWARDS_ID" property="awardsId" />
-        <result column="PRIZE_ID" property="prizeId" />
-        <result column="PRIZE_TYPE" property="prizeType" />
-        <result column="QUANTITY" property="quantity" />
-        <result column="CASHED_QTY" property="cashedQty" />
-        <result column="CREATED_TIME" property="createdTime" />
-        <result column="UPDATED_TIME" property="updatedTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        ID, AWARDS_ID, PRIZE_ID, PRIZE_TYPE, QUANTITY, CASHED_QTY, CREATED_TIME, UPDATED_TIME
-    </sql>
-
-</mapper>

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

@@ -1,32 +0,0 @@
-<?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.manager.mapper.TicketBoxMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qs.mp.manager.domain.TicketBox">
-        <id column="BOX_ID" property="boxId" />
-        <result column="TITLE" property="title" />
-        <result column="PIC_URL" property="picUrl" />
-        <result column="CATEGORY" property="category" />
-        <result column="DESCRIPTION" property="description" />
-        <result column="TYPE" property="type" />
-        <result column="QUANTITY" property="quantity" />
-        <result column="SALE_QTY" property="saleQty" />
-        <result column="BOX_PRICE" property="boxPrice" />
-        <result column="PKG_UNIT" property="pkgUnit" />
-        <result column="PKG_QTY" property="pkgQty" />
-        <result column="SALE_PKG_QTY" property="salePkgQty" />
-        <result column="FACE_PRICE" property="facePrice" />
-        <result column="SALE_PRICE" property="salePrice" />
-        <result column="SALE_COMM_RATE" property="saleCommRate" />
-        <result column="STATUS" property="status" />
-        <result column="CREATED_TIME" property="createdTime" />
-        <result column="UPDATED_TIME" property="updatedTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        BOX_ID, TITLE, PIC_URL, CATEGORY, DESCRIPTION, TYPE, QUANTITY, SALE_QTY, BOX_PRICE, PKG_UNIT, PKG_QTY, SALE_PKG_QTY, FACE_PRICE, SALE_PRICE, SALE_COMM_RATE, STATUS, CREATED_TIME, UPDATED_TIME
-    </sql>
-
-</mapper>

mp-service/src/main/resources/mapper/manager/TicketMapper.xml

@@ -1,44 +0,0 @@
-<?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.manager.mapper.TicketMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qs.mp.manager.domain.Ticket">
-        <id column="TICKET_ID" property="ticketId" />
-        <result column="BOX_ID" property="boxId" />
-        <result column="PKG_ID" property="pkgId" />
-        <result column="TITLE" property="title" />
-        <result column="SERIAL_NO" property="serialNo" />
-        <result column="FACE_PRICE" property="facePrice" />
-        <result column="CIPHER_LUCKY_NUM" property="cipherLuckyNum" />
-        <result column="PLAIN_LUCKY_NUM" property="plainLuckyNum" />
-        <result column="DRAW_NUM1" property="drawNum1" />
-        <result column="DRAW_NUM2" property="drawNum2" />
-        <result column="DRAW_NUM3" property="drawNum3" />
-        <result column="DRAW_NUM4" property="drawNum4" />
-        <result column="DRAW_NUM5" property="drawNum5" />
-        <result column="DRAW_NUM6" property="drawNum6" />
-        <result column="DRAW_NUM7" property="drawNum7" />
-        <result column="DRAW_NUM8" property="drawNum8" />
-        <result column="DRAW_NUM9" property="drawNum9" />
-        <result column="DRAW_NUM10" property="drawNum10" />
-        <result column="DRAW_NUM11" property="drawNum11" />
-        <result column="DRAW_NUM12" property="drawNum12" />
-        <result column="DRAW_NUM13" property="drawNum13" />
-        <result column="DRAW_NUM14" property="drawNum14" />
-        <result column="DRAW_NUM15" property="drawNum15" />
-        <result column="DRAW_NUM16" property="drawNum16" />
-        <result column="DRAW_NUM17" property="drawNum17" />
-        <result column="DRAW_NUM18" property="drawNum18" />
-        <result column="IS_PHYSICAL" property="isPhysical" />
-        <result column="STATUS" property="status" />
-        <result column="CREATED_TIME" property="createdTime" />
-        <result column="UPDATED_TIME" property="updatedTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        TICKET_ID, BOX_ID, PKG_ID, TITLE, SERIAL_NO, FACE_PRICE, CIPHER_LUCKY_NUM, PLAIN_LUCKY_NUM, DRAW_NUM1, DRAW_NUM2, DRAW_NUM3, DRAW_NUM4, DRAW_NUM5, DRAW_NUM6, DRAW_NUM7, DRAW_NUM8, DRAW_NUM9, DRAW_NUM10, DRAW_NUM11, DRAW_NUM12, DRAW_NUM13, DRAW_NUM14, DRAW_NUM15, DRAW_NUM16, DRAW_NUM17, DRAW_NUM18, IS_PHYSICAL, STATUS, CREATED_TIME, UPDATED_TIME
-    </sql>
-
-</mapper>

mp-service/src/main/resources/mapper/manager/TicketPackageMapper.xml

@@ -1,21 +0,0 @@
-<?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.manager.mapper.TicketPackageMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qs.mp.manager.domain.TicketPackage">
-        <id column="PKG_ID" property="pkgId" />
-        <result column="BOX_ID" property="boxId" />
-        <result column="START_SN" property="startSn" />
-        <result column="END_SN" property="endSn" />
-        <result column="STATUS" property="status" />
-        <result column="CREATED_TIME" property="createdTime" />
-        <result column="UPDATED_TIME" property="updatedTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        PKG_ID, BOX_ID, START_SN, END_SN, STATUS, CREATED_TIME, UPDATED_TIME
-    </sql>
-
-</mapper>

pom.xml

@@ -21,8 +21,9 @@
         <druid.version>1.2.6</druid.version>
         <bitwalker.version>1.21</bitwalker.version>
         <swagger.version>3.0.0</swagger.version>
-		<kaptcha.version>2.3.2</kaptcha.version>
-		<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
+        <orika.version>1.5.4</orika.version>
+		    <kaptcha.version>2.3.2</kaptcha.version>
+		    <mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
         <pagehelper.boot.version>1.3.1</pagehelper.boot.version>
         <fastjson.version>1.2.76</fastjson.version>
         <oshi.version>5.8.0</oshi.version>
@@ -135,7 +136,11 @@
                 <artifactId>jna-platform</artifactId>
                 <version>${jna.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>ma.glasnost.orika</groupId>
+                <artifactId>orika-core</artifactId>
+                <version>${orika.version}</version>
+            </dependency>
             <!-- Swagger3依赖 -->
             <dependency>
                 <groupId>io.springfox</groupId>
@@ -329,4 +334,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
+</project>