submit

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

@@ -2,12 +2,15 @@ package com.zhongzheng.controller.distribution;
 
 import com.zhongzheng.common.core.controller.BaseController;
 import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.core.domain.model.TopLoginUser;
 import com.zhongzheng.common.core.page.TableDataInfo;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.framework.web.service.TopTokenService;
+import com.zhongzheng.modules.distribution.bo.DistributionStatusEditBo;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateAddBo;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateEditBo;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateQueryBo;
-import com.zhongzheng.modules.distribution.bo.DistributionStatusEditBo;
 import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateService;
 import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTemplateVo;
 import io.swagger.annotations.Api;
@@ -32,6 +35,8 @@ public class DistributionActivityTemplateController extends BaseController {
 
     private final IDistributionActivityTemplateService iDistributionActivityTemplateService;
 
+    private final TopTokenService tokenService;
+
     /**
      * 查询【请填写功能名称】列表
      */
@@ -69,6 +74,8 @@ public class DistributionActivityTemplateController extends BaseController {
     @ApiOperation("新增分销活动模板")
     @PostMapping("/save")
     public AjaxResult<Void> add(@RequestBody DistributionActivityTemplateAddBo bo) {
+        TopLoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setCreateTopSysUserId(loginUser.getUser().getUserId());
         return toAjax(iDistributionActivityTemplateService.insertByAddBo(bo) ? 1 : 0);
     }
 

zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/DistributionActivityController.java

@@ -3,12 +3,13 @@ package com.zhongzheng.controller.distribution;
 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.utils.SecurityUtils;
 import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.modules.distribution.bo.DistributionActivityAddBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityEditBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityQueryBo;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityVo;
-import com.zhongzheng.system.bo.DistributionActivityAddBo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -69,6 +70,7 @@ public class DistributionActivityController extends BaseController {
     @ApiOperation("新增【请填写功能名称】")
     @PostMapping("/save")
     public AjaxResult<Void> add(@RequestBody DistributionActivityAddBo bo) {
+        bo.setCreateBy(SecurityUtils.getUsername());
         return toAjax(iDistributionActivityService.insertByAddBo(bo) ? 1 : 0);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/distribution/domain/DistributionActivity.java

@@ -53,7 +53,6 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;
     /** 创建人 */
-    @TableField(fill = FieldFill.INSERT)
     private String createBy;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)

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

@@ -15,8 +15,10 @@ import com.zhongzheng.modules.distribution.bo.DistributionActivityEditBo;
 import com.zhongzheng.modules.distribution.bo.DistributionActivityQueryBo;
 import com.zhongzheng.modules.distribution.domain.DistributionActivity;
 import com.zhongzheng.modules.distribution.domain.DistributionActivityGoods;
+import com.zhongzheng.modules.distribution.domain.DistributionActivityPoster;
 import com.zhongzheng.modules.distribution.mapper.DistributionActivityMapper;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityGoodsService;
+import com.zhongzheng.modules.distribution.service.IDistributionActivityPosterService;
 import com.zhongzheng.modules.distribution.service.IDistributionActivityService;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityGoodsVo;
 import com.zhongzheng.modules.distribution.vo.DistributionActivityVo;
@@ -25,6 +27,7 @@ import com.zhongzheng.modules.goods.service.IGoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -43,6 +46,8 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
     private IDistributionActivityGoodsService iDistributionActivityGoodsService;
     @Autowired
     private IGoodsService iGoodsService;
+    @Autowired
+    private IDistributionActivityPosterService iDistributionActivityPosterService;
 
     @Override
     public DistributionActivityVo queryById(Long distributionId){
@@ -77,7 +82,15 @@ public class DistributionActivityServiceImpl extends ServiceImpl<DistributionAct
         lqw.eq(bo.getEndTime() != null, DistributionActivity::getEndTime, bo.getEndTime());
         lqw.eq(bo.getTempId() != null, DistributionActivity::getTempId, bo.getTempId());
         lqw.eq(bo.getPosterId() != null, DistributionActivity::getPosterId, bo.getPosterId());
-        return entity2Vo(this.list(lqw));
+        List<DistributionActivityVo> voList = entity2Vo(this.list(lqw));
+        if (CollectionUtils.isEmpty(voList)){
+            return new ArrayList<>();
+        }
+        voList.forEach(item -> {
+            DistributionActivityPoster poster = iDistributionActivityPosterService.getById(item.getPosterId());
+            item.setPosterTempName(poster.getName());
+        });
+        return voList;
     }
 
     /**

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

@@ -64,6 +64,11 @@ public class DistributionActivityVo {
 	@Excel(name = "海报ID")
 	@ApiModelProperty("海报ID")
 	private Long posterId;
+	@ApiModelProperty("海报名称")
+	private String posterTempName;
+	/** 创建人 */
+	@ApiModelProperty("创建人")
+	private String createBy;
 	@ApiModelProperty("活动商品集合")
 	private List<DistributionActivityGoodsVo> goodsList;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/bo/DistributionActivityTemplateAddBo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.top.distribution.bo;
 
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTenantVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -53,6 +54,8 @@ public class DistributionActivityTemplateAddBo {
     /** 创建人 */
     @ApiModelProperty("创建人")
     private String createBy;
+    @ApiModelProperty("创建人ID")
+    private Long createTopSysUserId;
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
@@ -60,8 +63,8 @@ public class DistributionActivityTemplateAddBo {
     @ApiModelProperty("是否所有机构：1是，0否")
     private Integer isAllOrg;
 
-    @ApiModelProperty("机构ID集合")
-    private List<Long> tenantIds;
+    @ApiModelProperty("机构集合")
+    private List<DistributionActivityTenantVo> tenantList;
 
     @ApiModelProperty("活动商品集合")
     private List<DistributionActivityTemplateGoodsAddBo> goodsList;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/bo/DistributionActivityTemplateEditBo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.top.distribution.bo;
 
+import com.zhongzheng.modules.top.distribution.vo.DistributionActivityTenantVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -65,8 +66,8 @@ public class DistributionActivityTemplateEditBo {
     @ApiModelProperty("是否所有机构：1是，0否")
     private Integer isAllOrg;
 
-    @ApiModelProperty("机构ID集合")
-    private List<Long> tenantIds;
+    @ApiModelProperty("机构集合")
+    private List<DistributionActivityTenantVo> tenantList;
 
     @ApiModelProperty("活动商品集合")
     private List<DistributionActivityTemplateGoodsAddBo> goodsList;

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/distribution/domain/DistributionActivityTemplate.java

@@ -51,7 +51,6 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;
     /** 创建人 */
-    @TableField(fill = FieldFill.INSERT)
     private String createBy;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.Page;
 import com.zhongzheng.common.core.domain.entity.SysRole;
+import com.zhongzheng.common.core.domain.entity.TopSysUser;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.top.distribution.bo.DistributionActivityTemplateAddBo;
@@ -42,6 +43,7 @@ import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemp
 import com.zhongzheng.modules.top.distribution.service.IDistributionActivityTemplateService;
 import com.zhongzheng.modules.top.goods.domain.TopGoods;
 import com.zhongzheng.modules.top.goods.service.ITopGoodsService;
+import com.zhongzheng.modules.top.user.service.ITopSysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -86,6 +88,8 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
     private IInformSysUserService iInformSysUserService;
     @Autowired
     private IInformRemindService informRemindService;
+    @Autowired
+    private ITopSysUserService iTopSysUserService;
 
     @Override
     public DistributionActivityTemplateVo queryById(Long id){
@@ -180,6 +184,10 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        TopSysUser user = iTopSysUserService.getById(bo.getCreateTopSysUserId());
+        if (ObjectUtils.isNotNull(user)){
+            add.setCreateBy(user.getUserName());
+        }
         this.save(add);
         this.saveRelation(bo,add.getId());
         return true;
@@ -197,11 +205,11 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
             entity.setUpdateTime(DateUtils.getNowTime());
             iDistributionActivityTemplateRelationService.save(entity);
         }
-        if (CollectionUtils.isNotEmpty(bo.getTenantIds())){
-            List<DistributionActivityTemplateRelation> entitys = bo.getTenantIds().stream().map(id -> {
+        if (CollectionUtils.isNotEmpty(bo.getTenantList())){
+            List<DistributionActivityTemplateRelation> entitys = bo.getTenantList().stream().map(tenant -> {
                 DistributionActivityTemplateRelation entity = new DistributionActivityTemplateRelation();
                 entity.setDistributionTempId(tempId);
-                entity.setTenantId(id);
+                entity.setTenantId(tenant.getTenantId());
                 entity.setCreateTime(DateUtils.getNowTime());
                 entity.setUpdateTime(DateUtils.getNowTime());
                 return entity;
@@ -242,7 +250,7 @@ public class DistributionActivityTemplateServiceImpl extends ServiceImpl<Distrib
         DistributionActivityTemplateAddBo addBo = new DistributionActivityTemplateAddBo();
         addBo.setIsAllOrg(bo.getIsAllOrg());
         addBo.setGoodsList(bo.getGoodsList());
-        addBo.setTenantIds(bo.getTenantIds());
+        addBo.setTenantList(bo.getTenantList());
         this.saveRelation(addBo,bo.getId());
         return true;
     }

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

@@ -62,6 +62,9 @@ public class DistributionActivityTemplateVo {
 	@Excel(name = "结束时间")
 	@ApiModelProperty("结束时间")
 	private Long endTime;
+	/** 创建人 */
+	@ApiModelProperty("创建人")
+	private String createBy;
 
 	@ApiModelProperty("是否所有机构：1是，0否")
 	private Integer isAllOrg;