Merge branch 'master' of gitlab2.dui88.com:cengshuiping/jd-activity into...

Merge branch 'master' of gitlab2.dui88.com:cengshuiping/jd-activity into feature/20221027-jd-check-interface

 Conflicts:
	src/main/java/cn/com/duiba/jdactivity/developer/jd/utils/JdApiUtil.java

src/main/java/cn/com/duiba/jdactivity/controller/Open2DuibaController.java

@@ -740,4 +740,31 @@ public class Open2DuibaController {
         }
     }
 
+
+    /**
+     * 查询订单评价
+     *
+     * @param param
+     * @return
+     */
+    @PostMapping("/pageOrderComments")
+    public Result<Object> pageOrderComments(@RequestBody OrderCommentsParam param) {
+        try {
+            signVerify4Post(param, "查询订单评价");
+
+            TbShopAccessTokenDto accessToken = accessTokenUtils.getAccessTokenWithCache(param);
+            JdAppEnum appEnum = JdAppEnum.getAppByAppKey(accessToken.getAppKey());
+            String pin = convert2Pin(appEnum, accessToken.getAccessToken(), param.getUid());
+
+            Result<Object> result = jdApiUtil.pageOrderComments(appEnum, pin, accessToken.getAccessToken(), param);
+            LOGGER.info("查询订单评价,result={}", JSON.toJSONString(result));
+            return result;
+        } catch (BizException e) {
+            return ResultBuilder.fail(e.getMessage());
+        } catch (Exception e) {
+            LOGGER.error("查询订单评价,异常", e);
+            return ResultBuilder.fail("查询订单评价失败");
+        }
+    }
+
 }

src/main/java/cn/com/duiba/jdactivity/developer/jd/utils/JdApiUtil.java

@@ -6,6 +6,8 @@ import cn.com.duiba.jdactivity.common.vo.ResultBuilder;
 import cn.com.duiba.jdactivity.developer.jd.Main;
 import cn.com.duiba.jdactivity.developer.jd.constant.JdAppEnum;
 import cn.com.duiba.jdactivity.developer.jd.constant.JdServerUrlEnum;
+import cn.com.duiba.jdactivity.dto.DuibaOrderCommentsResp;
+import cn.com.duiba.jdactivity.dto.OrderCommentsParam;
 import cn.com.duiba.jdactivity.dto.DuibaPointDetailsParam;
 import com.alibaba.fastjson.JSON;
 import com.jd.open.api.sdk.DefaultJdClient;
@@ -23,6 +25,7 @@ import com.jd.open.api.sdk.domain.user.UserRelatedRpcService.response.getUserInf
 import com.jd.open.api.sdk.request.JdRequest;
 import com.jd.open.api.sdk.request.crm.PointsJosSendPointsRequest;
 import com.jd.open.api.sdk.request.crm.PopCrmCustomerGetCustomerRequest;
+import com.jd.open.api.sdk.request.evaluation.PopPopCommentJsfServiceGetVenderCommentsForJosRequest;
 import com.jd.open.api.sdk.request.gongzhonghao.JzoneAddCartItemByPinRequest;
 import com.jd.open.api.sdk.request.market.GetPurchaseInfoRequest;
 import com.jd.open.api.sdk.request.openid.JosTokenSourceToOpenIdRequest;
@@ -36,6 +39,7 @@ import com.jd.open.api.sdk.request.ware.WareReadFindWareByIdRequest;
 import com.jd.open.api.sdk.request.ware.WareReadSearchWare4ValidRequest;
 import com.jd.open.api.sdk.response.crm.PointsJosSendPointsResponse;
 import com.jd.open.api.sdk.response.crm.PopCrmCustomerGetCustomerResponse;
+import com.jd.open.api.sdk.response.evaluation.PopPopCommentJsfServiceGetVenderCommentsForJosResponse;
 import com.jd.open.api.sdk.response.gongzhonghao.JzoneAddCartItemByPinResponse;
 import com.jd.open.api.sdk.response.market.GetPurchaseInfoResponse;
 import com.jd.open.api.sdk.response.openid.JosTokenSourceToOpenIdResponse;
@@ -464,7 +468,7 @@ public class JdApiUtil {
 
             return Optional.ofNullable(response)
                     .map(FollowProductComplexWriteFollowResponse::getFollowResult)
-                    .map((Function<com.jd.open.api.sdk.domain.user.FollowProductWriteRpcService.response.follow.Result,Result<Boolean>>) resultData -> {
+                    .map((Function<com.jd.open.api.sdk.domain.user.FollowProductWriteRpcService.response.follow.Result, Result<Boolean>>) resultData -> {
                         boolean success = Objects.equals("F10000", resultData.getCode());
                         if (success) {
                             return ResultBuilder.success(Boolean.TRUE);
@@ -477,6 +481,76 @@ public class JdApiUtil {
         }
     }
 
+    /**
+     * 分页获取订单评价
+     *
+     * @param jdAppEnum
+     * @param pin
+     * @param accessToken
+     * @param param
+     * @return
+     */
+    public Result<Object> pageOrderComments(JdAppEnum jdAppEnum, String pin, String accessToken, OrderCommentsParam param) {
+        PopPopCommentJsfServiceGetVenderCommentsForJosRequest request = new PopPopCommentJsfServiceGetVenderCommentsForJosRequest();
+        request.setPin(pin);
+        request.setPage(param.getPage());
+        request.setPageSize(param.getPageSize());
+        if (StringUtils.isNotBlank(param.getSkuids())) {
+            request.setSkuids(param.getSkuids());
+        }
+        if (StringUtils.isNotBlank(param.getWareName())) {
+            request.setWareName(param.getWareName());
+        }
+        if (StringUtils.isNotBlank(param.getBeginTime())) {
+            request.setBeginTime(param.getBeginTime());
+        }
+        if (StringUtils.isNotBlank(param.getEndTime())) {
+            request.setEndTime(param.getEndTime());
+        }
+        if (param.getScore() != null) {
+            request.setScore(param.getScore());
+        }
+        if (StringUtils.isNotBlank(param.getContent())) {
+            request.setContent(param.getContent());
+        }
+        if (param.getVenderReply() != null) {
+            request.setIsVenderReply(param.getVenderReply());
+        }
+        if (StringUtils.isNotBlank(param.getCid())) {
+            request.setCid(param.getCid());
+        }
+        if (StringUtils.isNotBlank(param.getOrderIds())) {
+            request.setOrderIds(param.getOrderIds());
+        }
+
+        try {
+            Result<PopPopCommentJsfServiceGetVenderCommentsForJosResponse> result = execute(jdAppEnum, accessToken, request);
+            if (!result.getSuccess()) {
+                return ResultBuilder.fail(result.getDesc());
+            }
+            PopPopCommentJsfServiceGetVenderCommentsForJosResponse data = result.getData();
+            DuibaOrderCommentsResp resp = new DuibaOrderCommentsResp();
+            resp.setComments(data.getComments());
+            resp.setTotalItem(data.getTotalItem());
+            resp.setPage(data.getPage());
+            return ResultBuilder.success(resp);
+        } catch (Exception e) {
+            LOGGER.warn("分页获取订单评价,exception", e);
+            return ResultBuilder.fail("发生异常");
+        }
+    }
+
+//    public static void main(String[] args) {
+//        PopPopCommentJsfServiceGetVenderCommentsForJosRequest request = new PopPopCommentJsfServiceGetVenderCommentsForJosRequest();
+//        request.setPin("IIgCGEQOauuSVFdNoCLfmHQ4Xvl+yRVv7Nl+e3eKKbc1RhJEfIyYkQOIXfM9vJft");
+////        request.setOpenIdBuyer("1");
+//        request.setPage(0);
+//        request.setPageSize(100);
+//
+//        Result<PopPopCommentJsfServiceGetVenderCommentsForJosResponse> result = execute(JdAppEnum.DUIBA, "5d79029ada2a4a1f8d9fa72ba5713532ayow", request);
+//        System.out.println("调用京东接口返回参数\n"+JSON.toJSONString(result));
+//    }
+
 
     /**
      * 互动积分发放积分

src/main/java/cn/com/duiba/jdactivity/dto/DuibaOrderCommentsResp.java

+package cn.com.duiba.jdactivity.dto;
+
+import com.jd.open.api.sdk.domain.evaluation.PopCommentJsfService.response.getVenderCommentsForJos.PopCommentJosVo;
+
+import java.util.List;
+
+/**
+ * @Description 订单评论响应结果
+ * @Date 2022/11/11
+ * @Author WeiChaoChao
+ */
+public class DuibaOrderCommentsResp {
+    /**
+     * 评论信息列表
+     */
+    private List<PopCommentJosVo> comments;
+    /**
+     * 总条数
+     */
+    private int totalItem;
+    /**
+     * 页码
+     */
+    private int page;
+
+    public List<PopCommentJosVo> getComments() {
+        return comments;
+    }
+
+    public void setComments(List<PopCommentJosVo> comments) {
+        this.comments = comments;
+    }
+
+    public int getTotalItem() {
+        return totalItem;
+    }
+
+    public void setTotalItem(int totalItem) {
+        this.totalItem = totalItem;
+    }
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+}

src/main/java/cn/com/duiba/jdactivity/dto/OrderCommentsParam.java

+package cn.com.duiba.jdactivity.dto;
+
+/**
+ * @Description 获取订单评价接口
+ * @Date 2022/11/10
+ * @Author WeiChaoChao
+ */
+public class OrderCommentsParam extends DuibaUserParam {
+    /**
+     * sku列表
+     */
+    private String skuids;
+    /**
+     * 商品名
+     */
+    private String wareName;
+    /**
+     * 开始时间
+     */
+    private String beginTime;
+    /**
+     * 结束时间
+     */
+    private String endTime;
+    /**
+     * 评价等级 （全部0/好3/中2/差评1）
+     */
+    private Integer score;
+    /**
+     * 评价关键字（评价内容）
+     */
+    private String content;
+    /**
+     * 商家是否回复
+     */
+    private Boolean venderReply;
+    /**
+     * 类目ID
+     */
+    private String cid;
+    /**
+     * 订单号(最多50个 用,分隔)
+     */
+    private String orderIds;
+    /**
+     * 翻页
+     */
+    private Integer page;
+    /**
+     * 每页条数(最大50)
+     */
+    private Integer pageSize;
+
+    public String getSkuids() {
+        return skuids;
+    }
+
+    public void setSkuids(String skuids) {
+        this.skuids = skuids;
+    }
+
+    public String getWareName() {
+        return wareName;
+    }
+
+    public void setWareName(String wareName) {
+        this.wareName = wareName;
+    }
+
+    public String getBeginTime() {
+        return beginTime;
+    }
+
+    public void setBeginTime(String beginTime) {
+        this.beginTime = beginTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public Integer getScore() {
+        return score;
+    }
+
+    public void setScore(Integer score) {
+        this.score = score;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getCid() {
+        return cid;
+    }
+
+    public void setCid(String cid) {
+        this.cid = cid;
+    }
+
+    public String getOrderIds() {
+        return orderIds;
+    }
+
+    public void setOrderIds(String orderIds) {
+        this.orderIds = orderIds;
+    }
+
+    public Integer getPage() {
+        return page;
+    }
+
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public Boolean getVenderReply() {
+        return venderReply;
+    }
+
+    public void setVenderReply(Boolean venderReply) {
+        this.venderReply = venderReply;
+    }
+}