fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/goods/TopGoodsController.java

@@ -1,8 +1,13 @@
 package com.zhongzheng.controller.goods;
 
+import com.zhongzheng.common.annotation.Log;
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
 import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.modules.goods.bo.GoodsAddBo;
+import com.zhongzheng.modules.goods.bo.GoodsBankAddBo;
+import com.zhongzheng.modules.goods.service.IGoodsService;
 import com.zhongzheng.modules.goods.vo.TopGoodsVo;
 import com.zhongzheng.modules.top.goods.bo.TopGoodsQueryBo;
 import com.zhongzheng.modules.top.goods.service.ITopGoodsService;
@@ -10,9 +15,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -30,6 +34,8 @@ public class TopGoodsController extends BaseController {
 
     private final ITopGoodsService iTopGoodsService;
 
+    private final IGoodsService iGoodsService;
+
     /**
      * 商品批量复制
      */
@@ -59,4 +65,14 @@ public class TopGoodsController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 新增题库商品
+     */
+    @ApiOperation("新增积分商品")
+    @PreAuthorize("@ss.hasPermi('system:goods:add')")
+    @Log(title = "新增积分商品", businessType = BusinessType.INSERT)
+    @PostMapping("/points")
+    public AjaxResult<Void> addPoints(@RequestBody GoodsAddBo bo) {
+        return toAjax(iGoodsService.insertPointsByAddBo(bo)>0 ? 1 : 0);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsAddBo.java

@@ -194,4 +194,22 @@ public class GoodsAddBo {
     /** 提交官方审核备注说明 */
     @ApiModelProperty("提交官方审核备注说明")
     private String commitPeriodRemark;
+    /** 商品主图,拼接 */
+    @ApiModelProperty("商品主图,拼接")
+    private String mainImg;
+    /** 类目ID，拼接 */
+    @ApiModelProperty("类目ID，拼接")
+    private String categoryIds;
+    /** 优惠价 */
+    @ApiModelProperty("优惠价")
+    private BigDecimal specialPrice;
+    /** 店铺ID */
+    @ApiModelProperty("店铺ID")
+    private Long storeId;
+    /** 合作商户ID */
+    @ApiModelProperty("合作商户ID")
+    private Long merId;
+    /** 关联使用类型 1积分商城 2会员卡 */
+    @ApiModelProperty("关联使用类型 1积分商城 2会员卡,多个,拼接")
+    private String useType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsEditBo.java

@@ -228,4 +228,22 @@ public class GoodsEditBo {
     /** 提交官方审核备注说明 */
     @ApiModelProperty("提交官方审核备注说明")
     private String commitPeriodRemark;
+    /** 商品主图,拼接 */
+    @ApiModelProperty("商品主图,拼接")
+    private String mainImg;
+    /** 类目ID，拼接 */
+    @ApiModelProperty("类目ID，拼接")
+    private String categoryIds;
+    /** 优惠价 */
+    @ApiModelProperty("优惠价")
+    private BigDecimal specialPrice;
+    /** 店铺ID */
+    @ApiModelProperty("店铺ID")
+    private Long storeId;
+    /** 合作商户ID */
+    @ApiModelProperty("合作商户ID")
+    private Long merId;
+    /** 关联使用类型 1积分商城 2会员卡 */
+    @ApiModelProperty("关联使用类型 1积分商城 2会员卡,多个,拼接")
+    private String useType;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsQueryBo.java

@@ -210,5 +210,23 @@ public class GoodsQueryBo extends BaseEntity {
 	/** 提交官方审核备注说明 */
 	@ApiModelProperty("提交官方审核备注说明")
 	private String commitPeriodRemark;
+	/** 商品主图,拼接 */
+	@ApiModelProperty("商品主图,拼接")
+	private String mainImg;
+	/** 类目ID，拼接 */
+	@ApiModelProperty("类目ID，拼接")
+	private String categoryIds;
+	/** 优惠价 */
+	@ApiModelProperty("优惠价")
+	private BigDecimal specialPrice;
+	/** 店铺ID */
+	@ApiModelProperty("店铺ID")
+	private Long storeId;
+	/** 合作商户ID */
+	@ApiModelProperty("合作商户ID")
+	private Long merId;
+	/** 关联使用类型 1积分商城 2会员卡 */
+	@ApiModelProperty("关联使用类型 1积分商城 2会员卡,多个,拼接")
+	private String useType;
 
 }

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

@@ -156,4 +156,16 @@ private static final long serialVersionUID=1L;
     private Integer commitPeriodStatus;
     /** 提交官方审核备注说明 */
     private String commitPeriodRemark;
+    /** 商品主图,拼接 */
+    private String mainImg;
+    /** 类目ID，拼接 */
+    private String categoryIds;
+    /** 优惠价 */
+    private BigDecimal specialPrice;
+    /** 店铺ID */
+    private Long storeId;
+    /** 合作商户ID */
+    private Long merId;
+    /** 关联使用类型 1积分商城 2会员卡 */
+    private String useType;
 }

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

@@ -55,6 +55,8 @@ public interface IGoodsService extends IService<Goods> {
 
 	Long insertBankByAddBo(GoodsBankAddBo bo);
 
+	Long insertPointsByAddBo(GoodsAddBo bo);
+
 	/**
 	 * 根据编辑业务对象修改商品
 	 * @param bo 商品编辑业务对象

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

@@ -611,6 +611,22 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         return add.getGoodsId();
     }
 
+    @Override
+    public Long insertPointsByAddBo(GoodsAddBo bo) {
+        if(Validator.isEmpty(bo.getMerId())||Validator.isEmpty(bo.getStoreId())||Validator.isEmpty(bo.getGoodsName())||Validator.isEmpty(bo.getUseType())){
+            throw new CustomException("参数缺失");
+        }
+        Goods add = BeanUtil.toBean(bo, Goods.class);
+        add.setCode(ServletUtils.getEncoded("SP"));
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        add.setGoodsType(7);
+        add.setTenantId(867735392558919680L);
+        boolean result = this.save(add);
+        return add.getGoodsId();
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean updateByEditBo(GoodsEditBo bo) {
@@ -4507,7 +4523,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
     @Override
-    
+
     public Goods getOneGoods(String code, Long id) {
         return getOne(new LambdaQueryWrapper<Goods>()
                 .eq(Goods::getCode, code)

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsVo.java

@@ -361,4 +361,28 @@ public class GoodsVo {
 	private String commitPeriodRemark;
 	@ApiModelProperty("是否是二建二造")
 	private Boolean erJianErZao;
+	/** 商品主图,拼接 */
+	@Excel(name = "商品主图,拼接")
+	@ApiModelProperty("商品主图,拼接")
+	private String mainImg;
+	/** 类目ID，拼接 */
+	@Excel(name = "类目ID，拼接")
+	@ApiModelProperty("类目ID，拼接")
+	private String categoryIds;
+	/** 优惠价 */
+	@Excel(name = "优惠价")
+	@ApiModelProperty("优惠价")
+	private BigDecimal specialPrice;
+	/** 店铺ID */
+	@Excel(name = "店铺ID")
+	@ApiModelProperty("店铺ID")
+	private Long storeId;
+	/** 合作商户ID */
+	@Excel(name = "合作商户ID")
+	@ApiModelProperty("合作商户ID")
+	private Long merId;
+	/** 关联使用类型 1积分商城 2会员卡 */
+	@Excel(name = "关联使用类型 1积分商城 2会员卡")
+	@ApiModelProperty("关联使用类型 1积分商城 2会员卡,多个,拼接")
+	private String useType;
 }

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -53,6 +53,12 @@
         <result property="certificateTpId" column="certificate_tp_id"/>
         <result property="commitPeriodStatus" column="commit_period_status"/>
         <result property="commitPeriodRemark" column="commit_period_remark"/>
+        <result property="mainImg" column="main_img"/>
+        <result property="categoryIds" column="category_ids"/>
+        <result property="specialPrice" column="special_price"/>
+        <result property="storeId" column="store_id"/>
+        <result property="merId" column="mer_id"/>
+        <result property="useType" column="use_type"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsVo" id="GoodsResultVo">
@@ -139,6 +145,12 @@
         <result property="goodsLearningOrder" column="goods_learning_order"/>
         <result property="commitPeriodStatus" column="commit_period_status"/>
         <result property="commitPeriodRemark" column="commit_period_remark"/>
+        <result property="mainImg" column="main_img"/>
+        <result property="categoryIds" column="category_ids"/>
+        <result property="specialPrice" column="special_price"/>
+        <result property="storeId" column="store_id"/>
+        <result property="merId" column="mer_id"/>
+        <result property="useType" column="use_type"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">