From 7804a7fa8eff2d3086eb32bb7a2fadb9fdcb36ab Mon Sep 17 00:00:00 2001 From: Administrator <15274802129@163.com> Date: Tue, 19 Aug 2025 11:19:25 +0800 Subject: [PATCH] feat(mall): 双击删除图片功能 --- src/main/java/cc/mrbird/febs/mall/controller/clothes/ViewClothesTypeController.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 99 insertions(+), 3 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/controller/clothes/ViewClothesTypeController.java b/src/main/java/cc/mrbird/febs/mall/controller/clothes/ViewClothesTypeController.java index 5163636..47699fd 100644 --- a/src/main/java/cc/mrbird/febs/mall/controller/clothes/ViewClothesTypeController.java +++ b/src/main/java/cc/mrbird/febs/mall/controller/clothes/ViewClothesTypeController.java @@ -2,17 +2,24 @@ import cc.mrbird.febs.common.controller.BaseController; import cc.mrbird.febs.common.entity.FebsConstant; +import cc.mrbird.febs.common.entity.FebsResponse; +import cc.mrbird.febs.common.enumerates.SocialPatternLocationTypeEnum; +import cc.mrbird.febs.common.utils.AppContants; import cc.mrbird.febs.common.utils.FebsUtil; +import cc.mrbird.febs.common.utils.RedisUtils; +import cc.mrbird.febs.mall.dto.clothes.AdminClothesPrintOrderDto; import cc.mrbird.febs.mall.entity.*; import cc.mrbird.febs.mall.mapper.*; import cc.mrbird.febs.mall.service.ClothesTypeService; import cc.mrbird.febs.mall.service.IAdminBannerService; import cc.mrbird.febs.mall.vo.AdminLabelSetVo; import cc.mrbird.febs.mall.vo.AdminMallOrderVo; -import cc.mrbird.febs.mall.vo.clothes.AdminClothesDeliverGoodsVo; -import cc.mrbird.febs.mall.vo.clothes.AdminClothesTypeInfoVo; +import cc.mrbird.febs.mall.vo.clothes.*; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import cn.hutool.json.JSON; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; @@ -51,6 +58,9 @@ private final ClothesSocialMuseMapper clothesSocialMuseMapper; private final ClothesSocialFileMapper clothesSocialFileMapper; private final MallExpressInfoMapper mallExpressInfoMapper; + private final ClothesPatternRemarkMapper clothesPatternRemarkMapper; + private final ClothesLocationRemarkMapper clothesLocationRemarkMapper; + private final RedisUtils redisUtils; /** * 社区分类列表 @@ -98,6 +108,27 @@ return FebsUtil.view("modules/clothesType/socialList"); } + + + /** + * 社区列表-查看评论 + * @return + */ + @GetMapping("/socialComment/{id}") + @RequiresPermissions("socialComment:view") + public String socialComment(@PathVariable Long id, Model model) { + + String existToken = redisUtils.getString(AppContants.SOCIAL_COMMENT); + if (StrUtil.isNotBlank(existToken)) { + Object o = redisUtils.get(existToken); + if (ObjectUtil.isNotEmpty(o)) { + redisUtils.del(existToken); + } + } + redisUtils.set(AppContants.SOCIAL_COMMENT, id, -1); + return FebsUtil.view("modules/clothesType/socialComment"); + } + /** * 社区-新增 */ @@ -106,6 +137,8 @@ public String socialAdd() { return FebsUtil.view("modules/clothesType/socialAdd"); } + + /** * 社区-修改 @@ -147,6 +180,46 @@ .eq(ClothesSocialMuse::getSocialId, clothesSocial.getId()) .last("LIMIT 1") ); + + List<AdminClothesPatternRemarkVo> patternData = new ArrayList<>(); + List<ClothesPatternRemark> patternRemarks = clothesPatternRemarkMapper.selectList( + Wrappers.lambdaQuery(ClothesPatternRemark.class) + .eq(ClothesPatternRemark::getSourceId, clothesSocialMuse.getId()) + .eq(ClothesPatternRemark::getType, SocialPatternLocationTypeEnum.MUSE.getValue()) + ); + if(CollUtil.isNotEmpty(patternRemarks)){ + for (ClothesPatternRemark entity : patternRemarks){ + AdminClothesPatternRemarkVo vo = new AdminClothesPatternRemarkVo(); + vo.setPatternId(entity.getPatternId()); + ClothesPattern clothesPattern = clothesPatternMapper.selectById(entity.getPatternId()); + vo.setPatternName(clothesPattern.getName()); + JSON parse = JSONUtil.parse(entity.getRemark()); + vo.setPatternText(parse.getByPath("text", String.class)); + vo.setSkuPatternImage(parse.getByPath("file", String.class)); + patternData.add(vo); + } + clothesSocialMuse.setPatternData(patternData); + } + List<AdminClothesLocationRemarkVo> locationData = new ArrayList<>(); + List<ClothesLocationRemark> locationRemarks = clothesLocationRemarkMapper.selectList( + Wrappers.lambdaQuery(ClothesLocationRemark.class) + .eq(ClothesLocationRemark::getSourceId, clothesSocialMuse.getId()) + .eq(ClothesLocationRemark::getType, SocialPatternLocationTypeEnum.MUSE.getValue()) + ); + if(CollUtil.isNotEmpty(locationRemarks)){ + for (ClothesLocationRemark entity : locationRemarks){ + AdminClothesLocationRemarkVo vo = new AdminClothesLocationRemarkVo(); + vo.setLocationId(entity.getLocationId()); + ClothesLocation clothesLocation = clothesLocationMapper.selectById(entity.getLocationId()); + vo.setLocationName(clothesLocation.getName()); + JSON parse = JSONUtil.parse(entity.getRemark()); + vo.setLocationText(parse.getByPath("text", String.class)); + vo.setSkuLocationImage(parse.getByPath("file", String.class)); + locationData.add(vo); + } + clothesSocialMuse.setLocationData(locationData); + } + model.addAttribute("socialMuse", clothesSocialMuse); return FebsUtil.view("modules/clothesType/socialMuseUpdate"); @@ -162,6 +235,25 @@ return FebsUtil.view("modules/clothesType/orderList"); } + + + + + /** + * 社区列表-查看评论 + * @return + */ + @GetMapping("/orderPrint/{id}") + @RequiresPermissions("orderPrint:view") + public String orderPrint(@PathVariable Long id, Model model) { + + AdminClothesPrintOrderDto dto = new AdminClothesPrintOrderDto(); + dto.setId(id); + AdminClothesPrintOrderVo adminClothesPrintOrderVo = clothesTypeService.printOrderEvent(dto); + model.addAttribute("orderPrint", adminClothesPrintOrderVo); + return FebsUtil.view("modules/clothesType/orderPrint"); + } + /** * 订单-发货 * @param id @@ -170,9 +262,13 @@ */ @GetMapping("deliverGoods/{id}") @RequiresPermissions("deliverGoods:update") - public String deliverGoods(@PathVariable long id, Model model) { + public String deliverGoods(@PathVariable Long id, Model model) { AdminClothesDeliverGoodsVo data = new AdminClothesDeliverGoodsVo(); ClothesOrder clothesOrder = clothesOrderMapper.selectById(id); + data.setId(clothesOrder.getId()); + data.setName(clothesOrder.getName()); + data.setPhone(clothesOrder.getPhone()); + data.setAddress(clothesOrder.getAddress()); data.setExpressCom("极兔快递"); MallExpressInfo mallExpressInfo = mallExpressInfoMapper.selectOne( Wrappers.lambdaQuery(MallExpressInfo.class) -- Gitblit v1.9.1