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

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

@@ -2,6 +2,8 @@ package cn.freemud.entities.vo.order;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author : xh.Z
  * @email : fisherman0510@163.com
@@ -19,7 +21,7 @@ public class WallaceTempActivityRequest {
     /**
      * 订单号
      */
-    private String orderCode;
+    private List<String> orderCodes;
 
 
 

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

@@ -614,8 +614,14 @@ public class OrderAdapterServiceImpl {
         if (assortmentCustomerInfoVo == null || StringUtils.isEmpty(assortmentCustomerInfoVo.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
         }
+        if (CollectionUtils.isEmpty(request.getOrderCodes())) {
+            return ResponseUtil.error(ResponseResult.PARAMETER_MISSING);
+        }
+        Map<String, Object> respVo = new HashMap<>();
+        boolean skip = false;
+        for (String orderCode : request.getOrderCodes()) {
             // 校验订单
-        QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo(null, request.getOrderCode(), null, null, LogThreadLocal.getTrackingNo());
+            QueryByCodeResponse orderDetailResponse = orderSdkService.getOrderInfo(null, orderCode, null, null, LogThreadLocal.getTrackingNo());
             if (orderDetailResponse == null || !ResponseResult.SUCCESS.getCode().equals(orderDetailResponse.getCode() + "") || orderDetailResponse.getResult() == null) {
                 return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
             }
@@ -623,17 +629,12 @@ public class OrderAdapterServiceImpl {
             if (!Objects.equals(orderInfoReqs.getUserId(), assortmentCustomerInfoVo.getMemberId())) {
                 return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
             }
-        Map<String, Object> respVo = new HashMap<>();
-        respVo.put("skip", false);
-        // 校验 是否可以参加活动
             // step1 调用敬轩, 是否能参加活动
             OrderBeanV1 orderBeanV1 = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
-        boolean skip = this.canJoinActivity(orderInfoReqs.getPartnerId(), orderBeanV1.getProductList(), orderBeanV1.getSettlementAmount().intValue());
-        if (!skip) {
-            return ResponseUtil.success(respVo);
-        }
-        // stpe2 调用光兴, 是否成功 +1
+            skip = this.canJoinActivity(orderInfoReqs.getPartnerId(), orderBeanV1.getProductList(), orderBeanV1.getSettlementAmount().intValue());
+            if (skip) {
                 try {
+                    // stpe2 调用光兴, 是否成功 +1
                     PepsiOrderSubmitRequest pepsiOrderSubmitRequest = new PepsiOrderSubmitRequest();
                     pepsiOrderSubmitRequest.setMemberId(orderInfoReqs.getUserId());
                     pepsiOrderSubmitRequest.setOrderCode(orderInfoReqs.getOrderCode());
@@ -645,6 +646,9 @@ public class OrderAdapterServiceImpl {
                     skip = false;
                     respVo.put("error", e.getMessage());
                 }
+            }
+
+        }
         respVo.put("skip", skip);
         return ResponseUtil.success(respVo);
     }