订单评价迁移到订单基础服务

order-application-service/src/main/java/cn/freemud/adapter/EvaluationAdapter.java

@@ -4,12 +4,15 @@ import cn.freemud.entities.dto.AddProductEvaluationReqDto;
 import cn.freemud.entities.vo.AddUserOrderEvaluationNewRequestVo;
 import cn.freemud.utils.EmojiUtil;
 import cn.freemud.utils.UnicodeUtil;
-import com.freemud.api.assortment.datamanager.entity.dto.InsertOrderEvaluationReqDto;
-import com.freemud.api.assortment.datamanager.entity.dto.InsertProductEvaluationReqDto;
-import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
+import com.freemud.application.sdk.api.ordercenter.request.evaluation.AddEvaluationReq;
+import com.freemud.application.sdk.api.ordercenter.request.evaluation.AddProductEvaluationDto;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 /**
  * All rights Reserved, Designed By www.freemud.com
@@ -26,25 +29,39 @@ import java.util.Date;
 @Component
 public class EvaluationAdapter {
 
-    public InsertOrderEvaluationReqDto convent2InsertOrderEvaluationReqDto(AddUserOrderEvaluationNewRequestVo reqVo, OrderBeanV1 orderBean) {
-        InsertOrderEvaluationReqDto request = new InsertOrderEvaluationReqDto();
-        request.setCustomer_name(EmojiUtil.filterEmoji(orderBean.getUserName(),""));
-        request.setCustomer_mobile(orderBean.getPhone());
-        request.setCustomer_photo_url(reqVo.getCustomerPhotoUrl());
+    public AddEvaluationReq convent2InsertOrderEvaluationReqDto(AddUserOrderEvaluationNewRequestVo reqVo, OrderInfoReqs orderInfo) {
+        AddEvaluationReq request = new AddEvaluationReq();
+        request.setCustomerName(EmojiUtil.filterEmoji(orderInfo.getUserName(),""));
+        if(CollectionUtils.isNotEmpty(orderInfo.getDeliveryContactInfoList())){
+            request.setCustomerMobile(orderInfo.getDeliveryContactInfoList().get(0).getMobile());
+        }
+        request.setCustomerPhotoUrl(reqVo.getCustomerPhotoUrl());
         request.setTaste(getDefaultValue(reqVo.getTaste()));
         request.setHealth(getDefaultValue(reqVo.getHealth()));
         request.setService(getDefaultValue(reqVo.getService()));
-        request.setDelivery_speed(getDefaultValue(reqVo.getDeliverySpeed()));
+        request.setDeliverySpeed(getDefaultValue(reqVo.getDeliverySpeed()));
         request.setSurroundings(getDefaultValue(reqVo.getSurroundings()));
-        request.setEvaluation_content(UnicodeUtil.filterSpecialChars(reqVo.getEvaluationContent()));
-        request.setCreate_order_time(new Date(orderBean.getGmtCreate()));
-        request.setModify_time(new Date());
-        request.setCreate_time(new Date());
-        request.setPartner_id(reqVo.getPartnerId());
-        request.setStore_id(orderBean.getShopId());
-        request.setStore_name(orderBean.getShopName());
-        request.setOrder_id(reqVo.getOrderId());
-        request.setOrder_type(orderBean.getOrderType());
+        request.setEvaluationContent(UnicodeUtil.filterSpecialChars(reqVo.getEvaluationContent()));
+        request.setCreateOrderTime(new Date(Long.parseLong(orderInfo.getCreateTime())));
+//        request.setModifyTime(new Date());
+//        request.setCreate_time(new Date());
+        request.setPartnerId(reqVo.getPartnerId());
+        request.setStoreId(orderInfo.getStoreId());
+        request.setStoreName(orderInfo.getStoreName());
+        request.setOrderId(reqVo.getOrderId());
+        request.setOrderType(orderInfo.getOrderType());
+
+        // 添加订单下的商品评价信息
+        List<AddProductEvaluationReqDto> addProductEvaluationList = reqVo.getProductEvaluationList();
+        if (CollectionUtils.isNotEmpty(addProductEvaluationList)) {
+            List<AddProductEvaluationDto> productEvaluationList = new ArrayList<>();
+            for (AddProductEvaluationReqDto addProductEvaluationReqDto : addProductEvaluationList) {
+                AddProductEvaluationDto addProductEvaluationDto = this.convent2InsertProductEvaluationReqDto(reqVo, addProductEvaluationReqDto);
+                productEvaluationList.add(addProductEvaluationDto);
+            }
+            request.setProductEvaluationList(productEvaluationList);
+        }
+
         return request;
     }
 
@@ -55,8 +72,8 @@ public class EvaluationAdapter {
         return value;
     }
 
-    public InsertProductEvaluationReqDto convent2InsertProductEvaluationReqDto(AddUserOrderEvaluationNewRequestVo reqVo, AddProductEvaluationReqDto addProductEvaluationReqDto) {
-        InsertProductEvaluationReqDto request = new InsertProductEvaluationReqDto();
+    public AddProductEvaluationDto convent2InsertProductEvaluationReqDto(AddUserOrderEvaluationNewRequestVo reqVo, AddProductEvaluationReqDto addProductEvaluationReqDto) {
+        AddProductEvaluationDto request = new AddProductEvaluationDto();
         request.setIsCall(addProductEvaluationReqDto.getIsCall() == null ? 0 : addProductEvaluationReqDto.getIsCall());
         request.setOrderId(reqVo.getOrderId());
         request.setPartnerId(reqVo.getPartnerId());

order-application-service/src/main/java/cn/freemud/entities/vo/GetEvaluationDetailByOrderIdRequestVo.java

@@ -5,4 +5,6 @@ import lombok.Data;
 @Data
 public class GetEvaluationDetailByOrderIdRequestVo {
     private String order_id;
+
+    private String partnerId;
 }

order-application-service/src/main/java/cn/freemud/entities/vo/GetEvaluationStatusNewRequestVo.java

@@ -18,6 +18,8 @@ import org.hibernate.validator.constraints.NotEmpty;
 @Data
 public class GetEvaluationStatusNewRequestVo {
 
+    private String partnerId;
+
     private String orderId;
 
     private String sessionId;

order-application-service/src/main/java/cn/freemud/service/EvaluationService.java

@@ -30,11 +30,6 @@ public interface EvaluationService {
     BaseResponse getEvaluationByOrderId(GetEvaluationDetailByOrderIdRequestVo requestVo);
 
     /**
-     * 判断订单是否已经评价
-     */
-    BaseResponse getEvaluationStatus(GetEvaluationDetailByOrderIdRequestVo requestVo);
-
-    /**
      * 判断订单是否已经评价（新接口）
      */
     BaseResponse getEvaluationStatusNew(GetEvaluationStatusNewRequestVo requestVo);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -281,4 +281,14 @@ public class InterfaceAddressConstant {
      */
     public static final String QUERY_APPEAL = "order/v2/queryOrderAppeal";
 
+    /**
+     * 添加评价
+     */
+    public static final String ADD_EVALUATION = "evaluation/addEvaluation";
+
+    /**
+     * 根据订单号查看订单评价详情
+     */
+    public static final String QUERY_EVALUATION = "evaluation/getEvaluationsByOrderId";
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/evaluation/AddEvaluationReq.java

+package com.freemud.application.sdk.api.ordercenter.request.evaluation;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class AddEvaluationReq {
+
+    /**
+     * 用户头像地址（暂不记入文档）
+     */
+    private String customerPhotoUrl;
+    /**
+     * 商户号
+     */
+    private String partnerId;
+    /**
+     * 订单号
+     */
+    private String orderId;
+    /**
+     * 环境
+     */
+    private Integer surroundings;
+    /**
+     * 卫生
+     */
+    private Integer health;
+    /**
+     * 口味
+     */
+    private Integer taste;
+    /**
+     * 服务
+     */
+    private Integer service;
+    /**
+     * 配送速度
+     */
+    private Integer deliverySpeed;
+    /**
+     * 评价内容
+     */
+    private String evaluationContent;
+    /**
+     * 参与评论有礼活动ID
+     */
+    private String activityId;
+    /**
+     * 顾客姓名
+     */
+    private String customerName;
+    /**
+     * 顾客手机号
+     */
+    private String customerMobile;
+    /**
+     * 门店编号
+     */
+    private String storeId;
+    /**
+     * 门店名称
+     */
+    private String storeName;
+    /**
+     * 下单时间
+     */
+    private Date createOrderTime;
+    /**
+     * 订单编号
+     */
+    private Integer orderType;
+
+    /**
+     * 商品评价详情
+     */
+    private List<AddProductEvaluationDto> productEvaluationList;
+
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/evaluation/AddProductEvaluationDto.java

+package com.freemud.application.sdk.api.ordercenter.request.evaluation;
+
+import lombok.Data;
+
+@Data
+public class AddProductEvaluationDto {
+
+    private String partnerId;
+    private String productId;
+    private String orderId;
+    private String productName;
+    private Integer productQty;
+    /**
+     * 点赞详情，0代表未做操作，1 点赞 ，2 点踩
+     */
+    private Integer isCall;
+
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/evaluation/GetEvaluationsByOrderIdReq.java

+package com.freemud.application.sdk.api.ordercenter.request.evaluation;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class GetEvaluationsByOrderIdReq {
+
+    private String partnerId;
+
+    @NotBlank(message = "订单号不能为空")
+    private String orderId;
+
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/evaluation/GetEvaluationsByOrderIdResultDto.java

+package com.freemud.application.sdk.api.ordercenter.request.evaluation;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GetEvaluationsByOrderIdResultDto {
+
+    private List<GetOrderEvaluationDto> orderEvaluations;
+
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/evaluation/GetOrderEvaluationDto.java

+package com.freemud.application.sdk.api.ordercenter.request.evaluation;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class GetOrderEvaluationDto {
+
+    private String partnerId;
+    private String customerName;
+    private String customerMobile;
+    private String customerPhotoUrl;
+    private String storeId;
+    private String storeName;
+    private Date createOrderTime;
+    private String orderId;
+    private Integer orderType;
+    private Integer surroundings;
+    private Integer health;
+    private Integer taste;
+    private Integer service;
+    private Integer deliverySpeed;
+    private Date createTime;
+    private Date modifyTime;
+    private String evaluationContent;
+    private String activityId;
+
+    private List<GetProductEvaluationDto> productEvaluationList;
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/evaluation/GetProductEvaluationDto.java

+package com.freemud.application.sdk.api.ordercenter.request.evaluation;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class GetProductEvaluationDto {
+
+    private Integer id;
+    private String partnerId;
+    private String orderId;
+    private String productId;
+    private String productName;
+    private Integer productQty;
+    private Integer isCall;
+    private Date createTime;
+    private Date modifyTime;
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -15,6 +15,9 @@ import com.freemud.application.sdk.api.ordercenter.request.carpark.ParkingOrderR
 import com.freemud.application.sdk.api.ordercenter.request.create.BatchQueryByCodesReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateFatherSonOrderReq;
 import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest;
+import com.freemud.application.sdk.api.ordercenter.request.evaluation.AddEvaluationReq;
+import com.freemud.application.sdk.api.ordercenter.request.evaluation.GetEvaluationsByOrderIdReq;
+import com.freemud.application.sdk.api.ordercenter.request.evaluation.GetEvaluationsByOrderIdResultDto;
 import com.freemud.application.sdk.api.ordercenter.response.*;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
@@ -1004,4 +1007,25 @@ public class OrderSdkService {
                 });
         return responseHandle(responseDTO);
     }
+
+    /**
+     * 添加评价
+     */
+    public OrderBaseResp addEvaluation(AddEvaluationReq request, String trackingNo) {
+        OrderBaseResp responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, ADD_EVALUATION,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
+
+    /**
+     * 根据订单号查看订单评价详情
+     */
+    public OrderBaseResp<GetEvaluationsByOrderIdResultDto> getEvaluationsByOrderId(GetEvaluationsByOrderIdReq request, String trackingNo) {
+        OrderBaseResp<GetEvaluationsByOrderIdResultDto> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, QUERY_EVALUATION,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<GetEvaluationsByOrderIdResultDto>>() {
+                });
+        return responseHandle(responseDTO);
+    }
 }