Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!914

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

@@ -69,6 +69,10 @@ public class Goods implements Serializable {
   @TableField("pic_url")
   private String picUrl;
 
+  @ApiModelProperty("商品类型:1实物,2卡密")
+  @TableField("type")
+  private Integer type;
+
   /**
    * 详情
    */
@@ -134,6 +138,10 @@ public class Goods implements Serializable {
   @TableField("merchant_info")
   private String merchantInfo;
 
+  @ApiModelProperty("使用链接")
+  @TableField("use_link")
+  private String useLink;
+
   @ApiModelProperty("供应商ID")
   @TableField("supplier_id")
   private Long supplierId;

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

@@ -0,0 +1,85 @@
+package com.qs.mp.admin.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+/**
+ * @describe 商品卡密关联表实体类
+ * @auther quanshu
+ * @create 2022-08-02 15:43:31
+ */
+@TableName("mp_goods_card")
+@Data
+@ApiModel("商品卡密关联表实体类")
+public class GoodsCard implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 商品id
+     */
+    @ApiModelProperty("商品id")
+    @TableField("goods_id")
+    private Long goodsId;
+
+    /**
+     * 卡号
+     */
+    @ApiModelProperty("卡号")
+    @TableField("card_no")
+    private String cardNo;
+
+    /**
+     * 卡密
+     */
+    @ApiModelProperty("卡密")
+    @TableField("card_pwd")
+    private String cardPwd;
+
+    /**
+     * 是否使用:0未使用,1已使用
+     */
+    @ApiModelProperty("是否使用:0未使用,1已使用")
+    @TableField("is_use")
+    private Integer isUse;
+
+    /**
+     * 逻辑删除标识
+     */
+    @ApiModelProperty("逻辑删除标识")
+    @TableField("is_deleted")
+    @TableLogic
+    private Integer isDeleted;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("created_time")
+    private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("updated_time")
+    private Date updatedTime;
+
+
+}

mp-service/src/main/java/com/qs/mp/admin/mapper/GoodsCardMapper.java

@@ -0,0 +1,13 @@
+package com.qs.mp.admin.mapper;
+
+import com.qs.mp.admin.domain.GoodsCard;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @auther quanshu
+ * @create 2022-08-02 15:43:31
+ * @describe 商品卡密关联表mapper类
+ */
+public interface GoodsCardMapper extends BaseMapper<GoodsCard> {
+
+}

mp-service/src/main/java/com/qs/mp/admin/service/IGoodsCardService.java

@@ -0,0 +1,16 @@
+package com.qs.mp.admin.service;
+
+import com.qs.mp.admin.domain.GoodsCard;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 商品卡密关联表 服务类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-08-02
+ */
+public interface IGoodsCardService extends IService<GoodsCard> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.qs.mp.admin.service.impl;
+
+import com.qs.mp.admin.domain.GoodsCard;
+import com.qs.mp.admin.mapper.GoodsCardMapper;
+import com.qs.mp.admin.service.IGoodsCardService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 商品卡密关联表 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-08-02
+ */
+@Service
+public class GoodsCardServiceImpl extends ServiceImpl<GoodsCardMapper, GoodsCard> implements IGoodsCardService {
+
+}

mp-service/src/main/java/com/qs/mp/user/domain/UserDeliverOrder.java

@@ -112,6 +112,10 @@ public class UserDeliverOrder implements Serializable {
   @TableField("memo")
   private String memo;
 
+  @ApiModelProperty("订单类型")
+  @TableField("type")
+  private Integer type;
+
 
   @ApiModelProperty("订单来源:1提货订单,2现金购买")
   @TableField("resource")

mp-service/src/main/java/com/qs/mp/user/domain/UserDeliverOrderItemCard.java

@@ -0,0 +1,71 @@
+package com.qs.mp.user.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+/**
+ * @describe 提货订单卡密关联表实体类
+ * @auther quanshu
+ * @create 2022-08-02 15:44:39
+ */
+@TableName("mp_user_deliver_order_item_card")
+@Data
+@ApiModel("提货订单卡密关联表实体类")
+public class UserDeliverOrderItemCard implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ApiModelProperty("主键")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 提货订单明细id
+     */
+    @ApiModelProperty("提货订单明细id")
+    @TableField("item_id")
+    private String itemId;
+
+    /**
+     * 关联卡密id
+     */
+    @ApiModelProperty("关联卡密id")
+    @TableField("card_id")
+    private Long cardId;
+
+    /**
+     * 逻辑删除标识
+     */
+    @ApiModelProperty("逻辑删除标识")
+    @TableField("is_deleted")
+    @TableLogic
+    private Integer isDeleted;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    @TableField("created_time")
+    private Date createdTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty("更新时间")
+    @TableField("updated_time")
+    private Date updatedTime;
+
+
+}

mp-service/src/main/java/com/qs/mp/user/mapper/UserDeliverOrderItemCardMapper.java

@@ -0,0 +1,13 @@
+package com.qs.mp.user.mapper;
+
+import com.qs.mp.user.domain.UserDeliverOrderItemCard;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @auther quanshu
+ * @create 2022-08-02 15:44:39
+ * @describe 提货订单卡密关联表mapper类
+ */
+public interface UserDeliverOrderItemCardMapper extends BaseMapper<UserDeliverOrderItemCard> {
+
+}

mp-service/src/main/java/com/qs/mp/user/service/IUserDeliverOrderItemCardService.java

@@ -0,0 +1,16 @@
+package com.qs.mp.user.service;
+
+import com.qs.mp.user.domain.UserDeliverOrderItemCard;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 提货订单卡密关联表 服务类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-08-02
+ */
+public interface IUserDeliverOrderItemCardService extends IService<UserDeliverOrderItemCard> {
+
+}

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderItemCardServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qs.mp.user.service.impl;
+
+import com.qs.mp.user.domain.UserDeliverOrderItemCard;
+import com.qs.mp.user.mapper.UserDeliverOrderItemCardMapper;
+import com.qs.mp.user.service.IUserDeliverOrderItemCardService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 提货订单卡密关联表 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-08-02
+ */
+@Service
+public class UserDeliverOrderItemCardServiceImpl extends ServiceImpl<UserDeliverOrderItemCardMapper, UserDeliverOrderItemCard> implements IUserDeliverOrderItemCardService {
+
+}

mp-service/src/main/resources/mapper/admin/GoodsCardMapper.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.GoodsCardMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.admin.domain.GoodsCard">
+        <id column="id" property="id" />
+        <result column="goods_id" property="goodsId" />
+        <result column="card_no" property="cardNo" />
+        <result column="card_pwd" property="cardPwd" />
+        <result column="is_use" property="isUse" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, goods_id, card_no, card_pwd, is_use, is_deleted, created_time, updated_time
+    </sql>
+
+</mapper>

mp-service/src/main/resources/mapper/user/UserDeliverOrderItemCardMapper.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.user.mapper.UserDeliverOrderItemCardMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.user.domain.UserDeliverOrderItemCard">
+        <id column="id" property="id" />
+        <result column="item_id" property="itemId" />
+        <result column="card_id" property="cardId" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, item_id, card_id, is_deleted, created_time, updated_time
+    </sql>
+
+</mapper>