Merge branch 'feature/20210707_hekuoOrderAutoComplete_miaohui' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java

order-application-service/pom.xml

@@ -131,7 +131,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.12.SNAPSHOT</version>
+            <version>5.5.16.RESEALE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>

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

@@ -86,7 +86,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();

order-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityApplicationClient.java

@@ -34,15 +34,6 @@ public interface ActivityApplicationClient {
     @PostMapping("/promotionActivity/payGiftCheckAndJoin")
     public BaseResponse<PayGiftCheckAndJoinResponseDto> payGiftCheckAndJoin(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
 
-    /**
-     * 查询可领券活动
-     * 目前:  评价有礼活动使用
-     */
-    @PostMapping("/promotionActivity/evaluate/checkAndJoin")
-    public BaseResponse<CheckAndJoinResponse> checkAndJoin(@RequestBody ActivityRequestCommon requestVo);
-
-
-
 
     /**
      *      同享支付有礼活动验证与参与
@@ -51,4 +42,13 @@ public interface ActivityApplicationClient {
      */
     @PostMapping("/promotionActivity/payGiftShareCheckAndJoin")
     BaseResponse<PayGiftCheckAndJoinResponseObj> payGiftCheckAndJoinNew(@RequestBody PayGitCheckAndJoinRequestDto requestVo);
+
+    /**
+     * 查询可领券活动
+     * 目前:  评价有礼活动使用
+     */
+    @PostMapping("/promotionActivity/evaluate/checkAndJoin")
+    public BaseResponse<CheckAndJoinResponse> checkAndJoin(@RequestBody ActivityRequestCommon requestVo);
+
+
 }

order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java

@@ -67,9 +67,10 @@ public class SaasOrderHandle {
         BaseQueryOrderRequest orderConfirmRequest = orderSdkAdapter.getOrderConfirmRequest(request.getOperator(), orderBean);
         orderSdkAdapter.convert2wmDeliveryTimeOut(orderConfirmRequest,this.wmDeliveryTimeOut);
         //合阔pos 商户订单状态不自动扭转
-        if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(orderBean.getCompanyId())) {
-            orderConfirmRequest.setNotAutomaticTwist(true);
-        }
+        // 2021-07-07 合阔自动
+//        if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(orderBean.getCompanyId())) {
+//            orderConfirmRequest.setNotAutomaticTwist(true);
+//        }
         BaseOrderResponse confirmOrderResponse = orderCenterSdkService.orderConfirmTake(orderConfirmRequest);
         //处理1秒重复接单问题 订单服务接单返回20067重复操作，20018状态机不支持认为接单成功
         if ("20067".equals(confirmOrderResponse.getErrcode().toString()) || "20018".equals(confirmOrderResponse.getErrcode().toString()) || "50002".equals(confirmOrderResponse.getErrcode().toString())) {