Merge branch 'KA-华莱士抽奖跳转百世新增接口' into qa

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

@@ -623,7 +623,7 @@ public class OrderAdapterServiceImpl {
         }
         Map<String, Object> respVo = new HashMap<>();
         boolean skip = false;
-        Map<String, Object> respMsg = new HashMap<>();
+        Map<String, Object> respMsg = new LinkedHashMap<>();
         for (String orderCode : request.getOrderCodes()) {
             // 校验订单
             QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo(null, orderCode, null, null, LogThreadLocal.getTrackingNo());
@@ -636,9 +636,9 @@ public class OrderAdapterServiceImpl {
             }
             // step1 调用敬轩, 是否能参加活动
             OrderBeanV1 orderBeanV1 = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
-            skip = this.canJoinActivity(orderBeanV1);
+            boolean canJoin = this.canJoinActivity(orderBeanV1);
             respMsg.put(orderCode, "skip is false");
-            if (skip) {
+            if (canJoin) {
                 try {
                     // stpe2 调用光兴, 是否成功 +1
                     PepsiOrderSubmitRequest pepsiOrderSubmitRequest = new PepsiOrderSubmitRequest();
@@ -646,10 +646,11 @@ public class OrderAdapterServiceImpl {
                     pepsiOrderSubmitRequest.setOrderCode(orderInfoReqs.getOrderCode());
                     pepsiOrderSubmitRequest.setPartnerId(orderInfoReqs.getPartnerId());
                     EdenResponse edenResponse = wallaceApplicationClient.pepsiOrderSubmit(pepsiOrderSubmitRequest);
-                    skip = Objects.equals(edenResponse.getStatusCode(), EdenResponse.SUCCESSCODE);
+                    if (!skip) {
+                        skip = Objects.equals(edenResponse.getStatusCode(), EdenResponse.SUCCESSCODE);
+                    }
                     respMsg.put(orderCode, JSON.toJSONString(edenResponse));
                 } catch (Exception e) {
-                    skip = false;
                     respMsg.put(orderCode, e.getMessage());
                 }
             }