submit

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateController.java

@@ -76,7 +76,7 @@ public class DistributionActivityTemplateController extends BaseController {
      * 修改【请填写功能名称】
      */
     @ApiOperation("修改分销活动模板")
-    @PutMapping("/edit")
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody DistributionActivityTemplateEditBo bo) {
         return toAjax(iDistributionActivityTemplateService.updateByEditBo(bo) ? 1 : 0);
     }

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateGoodsController.java

@@ -1,10 +1,8 @@
 package com.zhongzheng.controller.distribution;
 
-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.common.utils.poi.ExcelUtil;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateGoodsEditBo;
@@ -15,7 +13,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -39,7 +36,6 @@ public class DistributionActivityTemplateGoodsController extends BaseController
      * 查询【请填写功能名称】列表
      */
     @ApiOperation("查询【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:goods:list')")
     @GetMapping("/list")
     public TableDataInfo<DistributionActivityTemplateGoodsVo> list(DistributionActivityTemplateGoodsQueryBo bo) {
         startPage();
@@ -51,8 +47,6 @@ public class DistributionActivityTemplateGoodsController extends BaseController
      * 导出【请填写功能名称】列表
      */
     @ApiOperation("导出【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:goods:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<DistributionActivityTemplateGoodsVo> export(DistributionActivityTemplateGoodsQueryBo bo) {
         List<DistributionActivityTemplateGoodsVo> list = iDistributionActivityTemplateGoodsService.queryList(bo);
@@ -64,7 +58,6 @@ public class DistributionActivityTemplateGoodsController extends BaseController
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation("获取【请填写功能名称】详细信息")
-    @PreAuthorize("@ss.hasPermi('system:goods:query')")
     @GetMapping("/{id}")
     public AjaxResult<DistributionActivityTemplateGoodsVo> getInfo(@PathVariable("id" ) Long id) {
         return AjaxResult.success(iDistributionActivityTemplateGoodsService.queryById(id));
@@ -74,8 +67,6 @@ public class DistributionActivityTemplateGoodsController extends BaseController
      * 新增【请填写功能名称】
      */
     @ApiOperation("新增【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:goods:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody DistributionActivityTemplateGoodsAddBo bo) {
         return toAjax(iDistributionActivityTemplateGoodsService.insertByAddBo(bo) ? 1 : 0);
@@ -85,9 +76,7 @@ public class DistributionActivityTemplateGoodsController extends BaseController
      * 修改【请填写功能名称】
      */
     @ApiOperation("修改【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:goods:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping()
     public AjaxResult<Void> edit(@RequestBody DistributionActivityTemplateGoodsEditBo bo) {
         return toAjax(iDistributionActivityTemplateGoodsService.updateByEditBo(bo) ? 1 : 0);
     }
@@ -96,8 +85,6 @@ public class DistributionActivityTemplateGoodsController extends BaseController
      * 删除【请填写功能名称】
      */
     @ApiOperation("删除【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:goods:remove')")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
         return toAjax(iDistributionActivityTemplateGoodsService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplatePosterController.java

@@ -1,12 +1,9 @@
 package com.zhongzheng.controller.distribution;
 
 import cn.hutool.core.bean.BeanUtil;
-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.common.utils.poi.ExcelUtil;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplatePosterQueryBo;
 import com.zhongzheng.modules.distribution.bo.distributionActivityTemplatePosterEditBo;
@@ -19,7 +16,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -64,24 +60,10 @@ public class DistributionActivityTemplatePosterController extends BaseController
         return AjaxResult.success(voList);
     }
 
-    /**
-     * 导出【请填写功能名称】列表
-     */
-    @ApiOperation("导出【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:poster:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult<DistributionActivityTemplatePosterVo> export(DistributionActivityTemplatePosterQueryBo bo) {
-        List<DistributionActivityTemplatePosterVo> list = iDistributionActivityTemplatePosterService.queryList(bo);
-        ExcelUtil<DistributionActivityTemplatePosterVo> util = new ExcelUtil<DistributionActivityTemplatePosterVo>(DistributionActivityTemplatePosterVo.class);
-        return util.exportExcel(list, "【请填写功能名称】");
-    }
-
     /**
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation("获取海报模板详细信息")
-    @PreAuthorize("@ss.hasPermi('system:poster:query')")
     @GetMapping("/{posterTempId}")
     public AjaxResult<DistributionActivityTemplatePosterVo> getInfo(@PathVariable("posterTempId" ) Long posterTempId) {
         return AjaxResult.success(iDistributionActivityTemplatePosterService.queryById(posterTempId));
@@ -100,7 +82,7 @@ public class DistributionActivityTemplatePosterController extends BaseController
      * 修改【请填写功能名称】
      */
     @ApiOperation("修改海报模板")
-    @PutMapping("/edit")
+    @PostMapping("/edit")
     public AjaxResult<Void> edit(@RequestBody distributionActivityTemplatePosterEditBo bo) {
         return toAjax(iDistributionActivityTemplatePosterService.updateByEditBo(bo) ? 1 : 0);
     }
@@ -109,8 +91,6 @@ public class DistributionActivityTemplatePosterController extends BaseController
      * 删除【请填写功能名称】
      */
     @ApiOperation("删除【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:poster:remove')")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{posterTempIds}")
     public AjaxResult<Void> remove(@PathVariable Long[] posterTempIds) {
         return toAjax(iDistributionActivityTemplatePosterService.deleteWithValidByIds(Arrays.asList(posterTempIds), true) ? 1 : 0);

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityTemplateRelationController.java

@@ -1,10 +1,8 @@
 package com.zhongzheng.controller.distribution;
 
-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.common.utils.poi.ExcelUtil;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityTemplateRelationEditBo;
@@ -15,7 +13,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -39,7 +36,6 @@ public class DistributionActivityTemplateRelationController extends BaseControll
      * 查询【请填写功能名称】列表
      */
     @ApiOperation("查询【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:relation:list')")
     @GetMapping("/list")
     public TableDataInfo<DistributionActivityTemplateRelationVo> list(DistributionActivityTemplateRelationQueryBo bo) {
         startPage();
@@ -51,8 +47,6 @@ public class DistributionActivityTemplateRelationController extends BaseControll
      * 导出【请填写功能名称】列表
      */
     @ApiOperation("导出【请填写功能名称】列表")
-    @PreAuthorize("@ss.hasPermi('system:relation:export')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult<DistributionActivityTemplateRelationVo> export(DistributionActivityTemplateRelationQueryBo bo) {
         List<DistributionActivityTemplateRelationVo> list = iDistributionActivityTemplateRelationService.queryList(bo);
@@ -64,7 +58,6 @@ public class DistributionActivityTemplateRelationController extends BaseControll
      * 获取【请填写功能名称】详细信息
      */
     @ApiOperation("获取【请填写功能名称】详细信息")
-    @PreAuthorize("@ss.hasPermi('system:relation:query')")
     @GetMapping("/{id}")
     public AjaxResult<DistributionActivityTemplateRelationVo> getInfo(@PathVariable("id" ) Long id) {
         return AjaxResult.success(iDistributionActivityTemplateRelationService.queryById(id));
@@ -74,8 +67,6 @@ public class DistributionActivityTemplateRelationController extends BaseControll
      * 新增【请填写功能名称】
      */
     @ApiOperation("新增【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:relation:add')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult<Void> add(@RequestBody DistributionActivityTemplateRelationAddBo bo) {
         return toAjax(iDistributionActivityTemplateRelationService.insertByAddBo(bo) ? 1 : 0);
@@ -85,9 +76,7 @@ public class DistributionActivityTemplateRelationController extends BaseControll
      * 修改【请填写功能名称】
      */
     @ApiOperation("修改【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:relation:edit')")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
-    @PutMapping()
+    @PostMapping()
     public AjaxResult<Void> edit(@RequestBody DistributionActivityTemplateRelationEditBo bo) {
         return toAjax(iDistributionActivityTemplateRelationService.updateByEditBo(bo) ? 1 : 0);
     }
@@ -96,8 +85,6 @@ public class DistributionActivityTemplateRelationController extends BaseControll
      * 删除【请填写功能名称】
      */
     @ApiOperation("删除【请填写功能名称】")
-    @PreAuthorize("@ss.hasPermi('system:relation:remove')")
-    @Log(title = "【请填写功能名称】" , businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult<Void> remove(@PathVariable Long[] ids) {
         return toAjax(iDistributionActivityTemplateRelationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/service/impl/DistributionActivityTemplateServiceImpl.java

@@ -20,10 +20,13 @@ import com.zhongzheng.modules.distribution.mapper.DistributionActivityTempMapper
 import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateGoodsService;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateRelationService;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityTemplateService;
+import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateGoodsVo;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityTemplateVo;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityTenantVo;
 import com.zhongzheng.modules.system.domain.SysTenant;
 import com.zhongzheng.modules.system.service.ISysTenantService;
+import com.zhongzheng.modules.top.goods.domain.TopGoods;
+import com.zhongzheng.modules.top.goods.service.ITopGoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +50,8 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
     private IDistributionActivityTemplateGoodsService iDistributionActivityTemplateGoodsService;
     @Autowired
     private ISysTenantService iSysTenantService;
+    @Autowired
+    private ITopGoodsService iSysGoodsService;
 
     @Override
     public DistributionActivityTemplateVo queryById(Long id){
@@ -79,7 +84,16 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
                 .list(new LambdaQueryWrapper<DistributionActivityTemplateGoods>()
                 .eq(DistributionActivityTemplateGoods::getStatus, 1)
                 .eq(DistributionActivityTemplateGoods::getDistributionTempId, vo.getId()));
-
+        if (CollectionUtils.isNotEmpty(templateGoodsList)){
+            List<DistributionActivityTemplateGoodsVo> templateGoodsVos = templateGoodsList.stream().map(item -> {
+                DistributionActivityTemplateGoodsVo goodsVo = BeanUtil.toBean(item, DistributionActivityTemplateGoodsVo.class);
+                TopGoods topGoods = iSysGoodsService.getById(goodsVo.getGoodsId());
+                goodsVo.setGoodsName(topGoods.getGoodsName());
+                goodsVo.setGoodsPrice(topGoods.getStandPrice());
+                return goodsVo;
+            }).collect(Collectors.toList());
+            vo.setGoodsList(templateGoodsVos);
+        }
         return vo;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/vo/DistributionActivityTemplateGoodsVo.java

@@ -31,6 +31,8 @@ public class DistributionActivityTemplateGoodsVo {
 	@Excel(name = "商品ID")
 	@ApiModelProperty("商品ID")
 	private Long goodsId;
+	@ApiModelProperty("商品名称")
+	private String goodsName;
 	@ApiModelProperty("商品价格")
 	private BigDecimal goodsPrice;
 	/** 佣金上限 */