配送券展示

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

order-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityRequestCommon.java

 package cn.freemud.entities.dto.activity;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * @author : xh.Z
@@ -9,6 +11,8 @@ import lombok.Data;
  * @description :
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class ActivityRequestCommon {
 
     //订单号

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

@@ -126,7 +126,7 @@ public class EvaluationServiceImpl implements EvaluationService {
         }
         CheckAndJoinRequest requestCommon = getCheckAndJoinRequest(data, sessionId, orderId, activityId);
         BaseResponse<CheckAndJoinResponse> checkAndJoin = activityApplicationClient.checkAndJoin(requestCommon);
-        LogUtil.info("请求活动-评价有礼",requestCommon, checkAndJoin);
+//        LogUtil.info("请求活动-评价有礼",requestCommon, checkAndJoin);
         if (checkAndJoin != null
                 && checkAndJoin.getCode().equals(ResponseResult.SUCCESS.getCode())) {
             return checkAndJoin.getResult();
@@ -219,14 +219,16 @@ public class EvaluationServiceImpl implements EvaluationService {
 
         OrderEvaluationStatus orderEvaluationStatus = new OrderEvaluationStatus(1);
         List<AssortmentOrderEvaluation> orderEvaluationListAmount = assortmentEvaluationManager.getOrderEvaluationDetailsByOrderId(request.getOrderId());
+        CheckAndJoinResponse checkAndJoinMsg;
         if (orderEvaluationListAmount != null && orderEvaluationListAmount.size() > 0) {
             // 获取 评价有礼活动
             AssortmentOrderEvaluation assortmentOrderEvaluation = orderEvaluationListAmount.get(0);
-            CheckAndJoinResponse checkAndJoinMsg = getCheckAndJoinMsg(orderDetailResponse.getData(), request.getSessionId(), assortmentOrderEvaluation.getOrderId(), assortmentOrderEvaluation.getActivityId());
-            orderEvaluationStatus.setResult(checkAndJoinMsg);
+            checkAndJoinMsg = getCheckAndJoinMsg(orderDetailResponse.getData(), request.getSessionId(), assortmentOrderEvaluation.getOrderId(), assortmentOrderEvaluation.getActivityId());
         } else {
             orderEvaluationStatus.setStatus(2);
+            checkAndJoinMsg = getCheckAndJoinMsg(orderDetailResponse.getData(), request.getSessionId(), request.getOrderId(), null);
         }
+        orderEvaluationStatus.setResult(checkAndJoinMsg);
         return ResponseUtil.success(orderEvaluationStatus);
     }