Merge branch 'KA-20210617评价有礼ID1031153-周晓航'

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

@@ -87,7 +87,11 @@ public class EvaluationServiceImpl implements EvaluationService {
             // 添加订单评价信息
             InsertOrderEvaluationReqDto insertOrderEvaluationReqDto = evaluationAdapter.convent2InsertOrderEvaluationReqDto(request, order);
             // fisherman  有评价有礼数据 就设置到对象中
-            orderEvaluationStatus.setResult(getCheckAndJoinMsg(orderDetailResponse.getData(), request.getSessionId(), request.getOrderId(), null));
+            CheckAndJoinResponse checkAndJoinMsg = getCheckAndJoinMsg(orderDetailResponse.getData(), request.getSessionId(), request.getOrderId(), null);
+            orderEvaluationStatus.setResult(checkAndJoinMsg);
+            if (checkAndJoinMsg !=null) {
+                insertOrderEvaluationReqDto.setActivityId(checkAndJoinMsg.getActivityId());
+            }
             assortmentEvaluationManager.insertOrderEvaluationDetails(insertOrderEvaluationReqDto);
             // 添加订单下的商品评价信息
             List<AddProductEvaluationReqDto> addProductEvaluationList = request.getProductEvaluationList();