通知列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsController.java

@@ -146,4 +146,27 @@ public class GoodsController extends BaseController {
     }
 
 
+    /**
+     * 新增课程商品
+     */
+    @ApiOperation("新增补考前培商品")
+    @PreAuthorize("@ss.hasPermi('system:goods:add')")
+    @Log(title = "商品", businessType = BusinessType.INSERT)
+    @PostMapping("/make")
+    public AjaxResult<Void> addMake(@RequestBody GoodsAddBo bo) {
+        return toAjax(iGoodsService.insertMakeByAddBo(bo) ? 1 : 0);
+    }
+
+    /**
+     * 修改商品
+     */
+    @ApiOperation("修改补考前培商品")
+    @PreAuthorize("@ss.hasPermi('system:goods:edit')")
+    @Log(title = "商品", businessType = BusinessType.UPDATE)
+    @PostMapping("/make/edit")
+    public AjaxResult<Void> editMake(@RequestBody GoodsEditBo bo) {
+        return toAjax(iGoodsService.updateMakeByEditBo(bo) ? 1 : 0);
+    }
+
+
 }

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

@@ -26,8 +26,8 @@ public class GoodsAddBo {
     /** 供应方（服务） */
     @ApiModelProperty("供应方（服务）")
     private Long supplyId;
-    /**商品类型 1视频2题库 3面授 4服务 5组合 */
-    @ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")
+    /**商品类型 1视频2题库 3补考 4前培 */
+    @ApiModelProperty("商品类型 1视频2题库 3补考 4前培")
     private Long goodsType;
     /** 教育类型id */
     @ApiModelProperty("教育类型id")

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

@@ -23,8 +23,8 @@ public class GoodsBankAddBo {
     /** 供应方（服务） */
     @ApiModelProperty("供应方（服务）")
     private Long supplyId;
-    /**商品类型 1视频2题库 3面授 4服务 5组合 */
-    @ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")
+    /**商品类型 1视频2题库 3补考 4前培 */
+    @ApiModelProperty("商品类型 1视频2题库 3补考 4前培")
     private Long goodsType;
     /** 教育类型id */
     @ApiModelProperty("教育类型id")

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

@@ -29,8 +29,8 @@ public class GoodsBankEditBo {
     @ApiModelProperty("供应方（服务）")
     private Long supplyId;
 
-    /** 商品类型 1视频2题库 3面授 4服务 5组合 */
-    @ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")
+    /** 商品类型 1视频2题库 3补考 4前培 */
+    @ApiModelProperty("商品类型 1视频2题库 3补考 4前培")
     private Long goodsType;
 
     /** 教育类型id */

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

@@ -33,8 +33,8 @@ public class GoodsEditBo {
     @ApiModelProperty("供应方（服务）")
     private Long supplyId;
 
-    /** 商品类型 1视频2题库 3面授 4服务 5组合 */
-    @ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")
+    /** 商品类型 1视频2题库 3补考 4前培 */
+    @ApiModelProperty("商品类型 1视频2题库 3补考 4前培")
     private Long goodsType;
 
     /** 教育类型id */

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

@@ -44,8 +44,8 @@ public class GoodsQueryBo extends BaseEntity {
 	/** 供应方（服务） */
 	@ApiModelProperty("供应方（服务）")
 	private Long supplyId;
-	/** 商品类型 1视频2题库 3面授 4服务 5组合*/
-	@ApiModelProperty("商品类型 1视频2题库 3面授 4服务 5组合")
+	/** 商品类型 1视频2题库 3补考 4前培 */
+	@ApiModelProperty("商品类型 1视频2题库 3补考 4前培 ")
 	private Long goodsType;
 	/** 教育类型id */
 	@ApiModelProperty("教育类型id")

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

@@ -55,4 +55,8 @@ public interface IGoodsService extends IService<Goods> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	boolean insertMakeByAddBo(GoodsAddBo bo);
+
+	boolean updateMakeByEditBo(GoodsEditBo bo);
 }

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

@@ -278,4 +278,23 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public boolean insertMakeByAddBo(GoodsAddBo bo) {
+        Goods add = BeanUtil.toBean(bo, Goods.class);
+        add.setCode(ServletUtils.getEncoded("SP"));
+        validEntityBeforeSave(add);
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        boolean result = this.save(add);
+        return result;
+    }
+
+    @Override
+    public boolean updateMakeByEditBo(GoodsEditBo bo) {
+        Goods update = BeanUtil.toBean(bo, Goods.class);
+        validEntityBeforeSave(update);
+        update.setUpdateTime(DateUtils.getNowTime());
+        return this.updateById(update);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformRemindServiceImpl.java

@@ -139,16 +139,18 @@ public class InformRemindServiceImpl extends ServiceImpl<InformRemindMapper, Inf
         InformRemind update = BeanUtil.toBean(bo, InformRemind.class);
         validEntityBeforeSave(update);
         update.setUpdateTime(DateUtils.getNowTime());
-        LambdaQueryWrapper<InformRemindBusiness> lqw = Wrappers.lambdaQuery();
-        lqw.eq( InformRemindBusiness::getRemindId, bo.getId());
-        iInformRemindBusinessService.remove(lqw);
-        for (Long aLong : bo.getBusinessId()) {
-            InformRemindBusinessAddBo informRemindBusinessAddBo = new InformRemindBusinessAddBo();
-            informRemindBusinessAddBo.setRemindId(bo.getId());
-            informRemindBusinessAddBo.setBusinessId(aLong);
-            informRemindBusinessAddBo.setCreateTime(DateUtils.getNowTime());
-            informRemindBusinessAddBo.setUpdateTime(DateUtils.getNowTime());
-            iInformRemindBusinessService.insertByAddBo(informRemindBusinessAddBo);
+        if (bo.getBusinessId() != null) {
+            LambdaQueryWrapper<InformRemindBusiness> lqw = Wrappers.lambdaQuery();
+            lqw.eq(InformRemindBusiness::getRemindId, bo.getId());
+            iInformRemindBusinessService.remove(lqw);
+            for (Long aLong : bo.getBusinessId()) {
+                InformRemindBusinessAddBo informRemindBusinessAddBo = new InformRemindBusinessAddBo();
+                informRemindBusinessAddBo.setRemindId(bo.getId());
+                informRemindBusinessAddBo.setBusinessId(aLong);
+                informRemindBusinessAddBo.setCreateTime(DateUtils.getNowTime());
+                informRemindBusinessAddBo.setUpdateTime(DateUtils.getNowTime());
+                iInformRemindBusinessService.insertByAddBo(informRemindBusinessAddBo);
+            }
         }
         return this.updateById(update);
     }

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

@@ -87,6 +87,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="categoryName" column="category_name"/>
         <result property="handoutsId" column="handouts_id"/>
         <result property="templateType" column="template_type"/>
+        <result property="period" column="period"/>
+        <result property="makeStartTime" column="make_start_time"/>
+        <result property="makeEndTime" column="make_end_time"/>
+        <result property="studyCount" column="study_count"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.goods.bo.GoodsQueryBo" resultMap="GoodsResultVo">