MERGE

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/Goods.java

@@ -159,4 +159,6 @@ private static final long serialVersionUID=1L;
     private String commitPeriodRemark;
     /** 班级类型 1基础班 2强化班 3私塾班 */
     private Integer gradeType;
+    /** 题库商家ID */
+    private Integer questionMerchantId;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsQuestionRel.java

@@ -0,0 +1,43 @@
+package com.zhongzheng.modules.goods.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 【请填写功能名称】对象 goods_spec
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("goods_question_rel")
+public class GoodsQuestionRel implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    @TableId(value = "id")
+    private Long id;
+    /** 订单商品ID */
+    private Long orderGoodsId;
+    /** 题库商品ID */
+    private Long questionGoodsId;
+    /** 做题次数 */
+    private Long questionDoNum;
+    /** 1有效 0无效 */
+    private Integer status;
+    /** 创建时间 */
+    private Long createTime;
+    /** 更新时间 */
+    private Long updateTime;
+    private Long tenantId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/QuestionMerchant.java

@@ -0,0 +1,39 @@
+package com.zhongzheng.modules.goods.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 【请填写功能名称】对象 goods_spec
+ *
+ * @author ruoyi
+ * @date 2022-09-29
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@TableName("question_merchant")
+public class QuestionMerchant implements Serializable {
+
+private static final long serialVersionUID=1L;
+
+    @TableId(value = "merchant_id")
+    private Long merchantId;
+    /** 题库商家名称 */
+    private String merchantName;
+    /** 做题次数 */
+    private Long doNum;
+    /** 1有效 0无效 */
+    private Integer status;
+    /** 创建时间 */
+    private Long createTime;
+    /** 更新时间 */
+    private Long updateTime;
+    private Long tenantId;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/GoodsQuestionRelMapper.java

@@ -0,0 +1,13 @@
+package com.zhongzheng.modules.goods.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.goods.domain.GoodsQuestionRel;
+
+/**
+ *
+ *
+ * @author
+ * @date 2021-10-28
+ */
+public interface GoodsQuestionRelMapper extends BaseMapper<GoodsQuestionRel> {
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/QuestionMerchantMapper.java

@@ -0,0 +1,14 @@
+package com.zhongzheng.modules.goods.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.goods.domain.GoodsQuestionRel;
+import com.zhongzheng.modules.goods.domain.QuestionMerchant;
+
+/**
+ *
+ *
+ * @author
+ * @date 2021-10-28
+ */
+public interface QuestionMerchantMapper extends BaseMapper<QuestionMerchant> {
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/IGoodsQuestionRelService.java

@@ -0,0 +1,22 @@
+package com.zhongzheng.modules.goods.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.goods.bo.GoodsAttachedAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsAttachedEditBo;
+import com.zhongzheng.modules.goods.bo.GoodsAttachedQueryBo;
+import com.zhongzheng.modules.goods.domain.GoodsAttached;
+import com.zhongzheng.modules.goods.domain.GoodsQuestionRel;
+import com.zhongzheng.modules.goods.vo.GoodsAttachedVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品附加产品Service接口
+ *
+ * @author  hjl
+ * @date 2021-10-28
+ */
+public interface IGoodsQuestionRelService extends IService<GoodsQuestionRel> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/IQuestionMerchantService.java

@@ -0,0 +1,15 @@
+package com.zhongzheng.modules.goods.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhongzheng.modules.goods.domain.GoodsQuestionRel;
+import com.zhongzheng.modules.goods.domain.QuestionMerchant;
+
+/**
+ * 商品附加产品Service接口
+ *
+ * @author  hjl
+ * @date 2021-10-28
+ */
+public interface IQuestionMerchantService extends IService<QuestionMerchant> {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsQuestionRelServiceImpl.java

@@ -0,0 +1,18 @@
+package com.zhongzheng.modules.goods.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzheng.modules.goods.domain.GoodsQuestionRel;
+import com.zhongzheng.modules.goods.mapper.GoodsQuestionRelMapper;
+import com.zhongzheng.modules.goods.service.IGoodsQuestionRelService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ *
+ * @author  hjl
+ * @date 2021-10-28
+ */
+@Service
+public class GoodsQuestionRelServiceImpl extends ServiceImpl<GoodsQuestionRelMapper, GoodsQuestionRel> implements IGoodsQuestionRelService {
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/QuestionMerchantServiceImpl.java

@@ -0,0 +1,18 @@
+package com.zhongzheng.modules.goods.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhongzheng.modules.goods.domain.QuestionMerchant;
+import com.zhongzheng.modules.goods.mapper.QuestionMerchantMapper;
+import com.zhongzheng.modules.goods.service.IQuestionMerchantService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ *
+ * @author  hjl
+ * @date 2021-10-28
+ */
+@Service
+public class QuestionMerchantServiceImpl extends ServiceImpl<QuestionMerchantMapper, QuestionMerchant> implements IQuestionMerchantService {
+
+}