buyer-api/src/main/java/cn/lili/controller/order/OrderComplaintBuyerController.java
@@ -5,6 +5,7 @@ import cn.lili.common.security.AuthUser; import cn.lili.common.security.OperationalJudgment; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.OrderComplaint; @@ -15,6 +16,7 @@ import cn.lili.modules.order.order.entity.vo.OrderComplaintVO; import cn.lili.modules.order.order.service.OrderComplaintCommunicationService; import cn.lili.modules.order.order.service.OrderComplaintService; import cn.lili.utils.COSUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -24,6 +26,8 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.ArrayList; import java.util.List; import java.util.Objects; /** @@ -49,12 +53,35 @@ @Autowired private OrderComplaintCommunicationService orderComplaintCommunicationService; @Autowired private COSUtil cosUtil; @ApiOperation(value = "通过id获取") @ApiImplicitParam(name = "id", value = "投诉单ID", required = true, paramType = "path") @GetMapping(value = "/{id}") public ResultMessage<OrderComplaintVO> get(@PathVariable String id) { OrderComplaintVO orderComplaintVO = OperationalJudgment.judgment(orderComplaintService.getOrderComplainById(id)); String images = orderComplaintVO.getImages(); String[] split = images.split(","); List<String> img = new ArrayList<>(); for (String s : split) { if (StringUtils.isNotBlank(s)&&!s.contains("http")) { img.add(cosUtil.getPreviewUrl(s)); }else if (StringUtils.isNotBlank(s)) { img.add(s); } } List<String> img2 = new ArrayList<>(); String[] orderComplaintImages = orderComplaintVO.getOrderComplaintImages(); for (String s : orderComplaintImages) { if (StringUtils.isNotBlank(s)&&!s.contains("http")) { img2.add(cosUtil.getPreviewUrl(s)); }else if (StringUtils.isNotBlank(s)) { img2.add(s); } } orderComplaintVO.setOrderComplaintImages(img2.toArray(new String[img.size()])); orderComplaintVO.setImages(String.join(",", img)); return ResultUtil.data(orderComplaintVO); } @@ -63,7 +90,14 @@ public ResultMessage<IPage<OrderComplaint>> get(OrderComplaintSearchParams searchParams, PageVO pageVO) { AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser()); searchParams.setMemberId(currentUser.getId()); return ResultUtil.data(orderComplaintService.getOrderComplainByPage(searchParams, pageVO)); IPage<OrderComplaint> orderComplainByPage = orderComplaintService.getOrderComplainByPage(searchParams, pageVO); for (OrderComplaint record : orderComplainByPage.getRecords()) { String goodsImage = record.getGoodsImage(); if (StringUtils.isNotBlank(goodsImage)&&!goodsImage.contains("http")) { record.setGoodsImage(cosUtil.getPreviewUrl(goodsImage)); } } return ResultUtil.data(orderComplainByPage); } seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java
@@ -5,6 +5,7 @@ import cn.lili.common.security.AuthUser; import cn.lili.common.security.OperationalJudgment; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.order.order.entity.dos.OrderComplaint; @@ -12,6 +13,7 @@ import cn.lili.modules.order.order.entity.vo.*; import cn.lili.modules.order.order.service.OrderComplaintCommunicationService; import cn.lili.modules.order.order.service.OrderComplaintService; import cn.lili.utils.COSUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -20,6 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; /** @@ -45,11 +49,38 @@ @Autowired private OrderComplaintCommunicationService orderComplaintCommunicationService; @Autowired private COSUtil cosUtil; @ApiOperation(value = "通过id获取") @ApiImplicitParam(name = "id", value = "投诉单ID", required = true, paramType = "path") @GetMapping(value = "/{id}") public ResultMessage<OrderComplaintVO> get(@PathVariable String id) { return ResultUtil.data(OperationalJudgment.judgment(orderComplaintService.getOrderComplainById(id))); OrderComplaintVO orderComplainById = OperationalJudgment.judgment(orderComplaintService.getOrderComplainById(id)); String goodsImage = orderComplainById.getGoodsImage(); if (StringUtils.isNotBlank(goodsImage)&&!goodsImage.contains("http")) { orderComplainById.setGoodsImage(cosUtil.getPreviewUrl(goodsImage)); } String[] orderComplaintImages = orderComplainById.getOrderComplaintImages(); List<String> orderComplaintImagesList = new ArrayList<>(); for (String orderComplaintImage : orderComplaintImages) { if (StringUtils.isNotBlank(orderComplaintImage)&&!orderComplaintImage.contains("http")) { orderComplaintImagesList.add(cosUtil.getPreviewUrl(orderComplaintImage)); } } String images = orderComplainById.getImages(); String[] split = images.split(","); ArrayList<String> imgs = new ArrayList<>(); for (String s : split) { if (StringUtils.isNotBlank(s)) { if (StringUtils.isNotBlank(s)&&!s.contains("http")) { imgs.add(cosUtil.getPreviewUrl(s)); } } } String join = String.join(",", imgs); orderComplainById.setImages(join); orderComplainById.setOrderComplaintImages(orderComplaintImagesList.toArray(new String[0])); return ResultUtil.data(orderComplainById); } @ApiOperation(value = "分页获取")