Merge remote-tracking branch 'origin/user_action' into user_action

zxl

1 天以前 f3ccf81a4f203dd0d8957bab15c491cb2181e071

 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);

    }