From 6c823dd44dbde79f008001a2a11e7bf9bc6bf8cc Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期三, 04 十二月 2024 18:15:44 +0800 Subject: [PATCH] fix:合伙人列表操作日志 --- src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpCgService.java | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpCgService.java b/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpCgService.java index 8f59631..4f2d9b4 100644 --- a/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpCgService.java +++ b/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpCgService.java @@ -11,15 +11,20 @@ import com.mzl.flower.dto.response.flower.FlowerMarkupSpCgDTO; import com.mzl.flower.dto.response.flower.FlowerMarkupSpCgListDTO; import com.mzl.flower.entity.flower.FlowerMarkupSpCg; +import com.mzl.flower.entity.log.OperationRecord; import com.mzl.flower.entity.partner.Partner; import com.mzl.flower.mapper.flower.FlowerMarkupSpCgMapper; +import com.mzl.flower.mapper.log.OperationRecordMapper; import com.mzl.flower.service.BaseService; +import com.mzl.flower.utils.IpUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; import java.util.List; @Slf4j @@ -30,27 +35,44 @@ @Autowired private FlowerMarkupSpCgMapper spCgMapper; - public void saveMarkupSpCg(FlowerMarkupSpCgSaveDTO dto){ + @Autowired + private OperationRecordMapper operationRecordMapper; + + public void saveMarkupSpCg(FlowerMarkupSpCgSaveDTO dto, HttpServletRequest request) throws IOException { Long cId = dto.getCategoryId(); FlowerMarkupSpCg cg = spCgMapper.selectOne(new QueryWrapper<FlowerMarkupSpCg>() .eq("partner_id", dto.getPartnerId()).eq("category_id", cId)); + String content = ""; + OperationRecord operationRecord = new OperationRecord(); if(cg == null){ cg = new FlowerMarkupSpCg(); BeanUtils.copyProperties(dto, cg); cg.setPartnerId(dto.getPartnerId()); cg.create(SecurityUtils.getUserId()); spCgMapper.insert(cg); + content = "新增合伙人商品分类加价:商品分类Id:【" + cg.getCategoryId() + "】,A级:【"+cg.getLevelA()+"】,B级:【" + cg.getLevelB() + "】,C级:【" + cg.getLevelC() + "】" + + ",D级:【"+dto.getLevelD()+"】,E级:【" + cg.getLevelE() + "】,O级:【" + cg.getLevelO() + "】"; + operationRecord.setFunction("新增合伙人商品分类加价"); } else { BeanUtils.copyProperties(dto, cg); cg.update(SecurityUtils.getUserId()); spCgMapper.updateById(cg); + content = "修改合伙人商品分类加价:id:【"+cg.getId()+"】,商品分类Id:【" + cg.getCategoryId() + "】,A级:【"+cg.getLevelA()+"】,B级:【" + cg.getLevelB() + "】,C级:【" + cg.getLevelC() + "】" + + ",D级:【"+dto.getLevelD()+"】,E级:【" + cg.getLevelE() + "】,O级:【" + cg.getLevelO() + "】"; + operationRecord.setFunction("修改合伙人商品分类加价"); } markupCacheClient.addMarkupSpCg(dto.getPartnerId(), cId, cg); + operationRecord.setContent(content); + operationRecord.create(SecurityUtils.getUserId()); + operationRecord.setStatus("success"); + operationRecord.setModule("markup_s_p_cg"); + operationRecord.setIpAddress(IpUtil.getIpAddress(request)); + operationRecordMapper.insert(operationRecord); } - public void saveMarkupSpCgBatch(FlowerMarkupSpCgBatchSaveDTO dto) { + public void saveMarkupSpCgBatch(FlowerMarkupSpCgBatchSaveDTO dto,HttpServletRequest request) throws IOException { List<Long> categoryIds = dto.getCategoryId(); if (categoryIds == null || categoryIds.size() == 0) { throw new ValidationException("分类列表不能为空"); @@ -59,7 +81,7 @@ FlowerMarkupSpCgSaveDTO cg = new FlowerMarkupSpCgSaveDTO(); BeanUtils.copyProperties(dto, cg); cg.setCategoryId(categoryId); - saveMarkupSpCg(cg); + saveMarkupSpCg(cg,request); } } public FlowerMarkupSpCgDTO getMarkupSpCg(Long categoryId){ -- Gitblit v1.9.3