评价有礼开发

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -20,4 +20,6 @@ public class GetEvaluationStatusNewRequestVo {
 
     private String orderId;
 
+    private String sessionId;
+
 }

order-application-service/src/main/java/cn/freemud/service/impl/EvaluationServiceImpl.java

@@ -13,6 +13,7 @@ import cn.freemud.entities.vo.GetEvaluationDetailByOrderIdRequestVo;
 import cn.freemud.entities.vo.GetEvaluationStatusNewRequestVo;
 import cn.freemud.enums.EvaluationStatus;
 import cn.freemud.enums.ResponseResult;
+import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.EvaluationService;
 import cn.freemud.service.thirdparty.ActivityApplicationClient;
 import cn.freemud.utils.DateUtils;
@@ -80,14 +81,14 @@ public class EvaluationServiceImpl implements EvaluationService {
                 // 已经评价 查询是否有活动数据
                 AssortmentOrderEvaluation assortmentOrderEvaluation = orderEvaluationDetails.get(0);
                 orderEvaluationStatus.setStatus(EvaluationStatus.REPEAT.getCode());
-                CheckAndJoinResponse checkAndJoinMsg = getCheckAndJoinMsg(orderDetailResponse.getData(), request, assortmentOrderEvaluation.getActivityId());
+                CheckAndJoinResponse checkAndJoinMsg = getCheckAndJoinMsg(orderDetailResponse.getData(), request.getSessionId(), request.getOrderId(), assortmentOrderEvaluation.getActivityId());
                 orderEvaluationStatus.setResult(checkAndJoinMsg);
                 return ResponseUtil.success(orderEvaluationStatus);
             }
             // 添加订单评价信息
             InsertOrderEvaluationReqDto insertOrderEvaluationReqDto = evaluationAdapter.convent2InsertOrderEvaluationReqDto(request, order);
             // fisherman  有评价有礼数据 就设置到对象中
-            orderEvaluationStatus.setResult(getCheckAndJoinMsg(orderDetailResponse.getData(), request, null));
+            orderEvaluationStatus.setResult(getCheckAndJoinMsg(orderDetailResponse.getData(), request.getSessionId(), request.getOrderId(), null));
             assortmentEvaluationManager.insertOrderEvaluationDetails(insertOrderEvaluationReqDto);
             // 添加订单下的商品评价信息
             List<AddProductEvaluationReqDto> addProductEvaluationList = request.getProductEvaluationList();
@@ -108,11 +109,16 @@ public class EvaluationServiceImpl implements EvaluationService {
      * 获取活动数据 用于校验
      *
      * @param data
-     * @param request
+     * @param sessionId
+     * @param orderId
      * @param activityId
+     * @return
      */
-    private CheckAndJoinResponse getCheckAndJoinMsg(QueryOrdersResponse.DataBean.OrderBean data, AddUserOrderEvaluationNewRequestVo request, String activityId) {
-        CheckAndJoinRequest requestCommon = getCheckAndJoinRequest(data, request, activityId);
+    private CheckAndJoinResponse getCheckAndJoinMsg(QueryOrdersResponse.DataBean.OrderBean data,
+                                                    String sessionId,
+                                                    String orderId,
+                                                    String activityId) {
+        CheckAndJoinRequest requestCommon = getCheckAndJoinRequest(data, sessionId, orderId, activityId);
         BaseResponse<CheckAndJoinResponse> checkAndJoin = activityApplicationClient.checkAndJoin(requestCommon);
         if (checkAndJoin != null
                 && checkAndJoin.getCode().equals(ResponseResult.SUCCESS.getCode())) {
@@ -122,11 +128,12 @@ public class EvaluationServiceImpl implements EvaluationService {
     }
 
     private CheckAndJoinRequest getCheckAndJoinRequest(QueryOrdersResponse.DataBean.OrderBean data,
-                                                       AddUserOrderEvaluationNewRequestVo request,
+                                                       String sessionId,
+                                                       String orderId,
                                                        String activityId) {
         CheckAndJoinRequest requestCommon = new CheckAndJoinRequest();
-        requestCommon.setOid(request.getOrderId());
-        requestCommon.setSessionId(request.getSessionId());
+        requestCommon.setOid(orderId);
+        requestCommon.setSessionId(sessionId);
         requestCommon.setStoreId(data.getShopId());
         requestCommon.setOrderCreateTime(DateUtil.convert2Str(new Date(data.getGmtCreate()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
         requestCommon.setActivityId(activityId);
@@ -196,11 +203,24 @@ public class EvaluationServiceImpl implements EvaluationService {
         if (StringUtils.isEmpty(request.getOrderId())) {
             return ResponseUtil.success(new OrderEvaluationStatus(2));
         }
+        BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
+        baseQueryOrderRequest.setOrderId(request.getOrderId());
+        OrderDetailResponse orderDetailResponse = orderCenterSdkService.getByIdForParentProduct(baseQueryOrderRequest);
+        if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getErrcode() + "") || orderDetailResponse.getData() == null) {
+            throw new ServiceException(ResponseResult.ORDER_NOT_EXIST);
+        }
+
+        OrderEvaluationStatus orderEvaluationStatus = new OrderEvaluationStatus(1);
         List<AssortmentOrderEvaluation> orderEvaluationListAmount = assortmentEvaluationManager.getOrderEvaluationDetailsByOrderId(request.getOrderId());
         if (orderEvaluationListAmount != null && orderEvaluationListAmount.size() > 0) {
-            return ResponseUtil.success(new OrderEvaluationStatus(1));
+            // 获取 评价有礼活动
+            AssortmentOrderEvaluation assortmentOrderEvaluation = orderEvaluationListAmount.get(0);
+            CheckAndJoinResponse checkAndJoinMsg = getCheckAndJoinMsg(orderDetailResponse.getData(), request.getSessionId(), assortmentOrderEvaluation.getOrderId(), assortmentOrderEvaluation.getActivityId());
+            orderEvaluationStatus.setResult(checkAndJoinMsg);
         } else {
-            return ResponseUtil.success(new OrderEvaluationStatus(2));
+            orderEvaluationStatus.setStatus(2);
         }
+        return ResponseUtil.success(orderEvaluationStatus);
     }
+
 }