Merge remote-tracking branch 'remotes/origin/feature/1.9.20_查询促销补门店和渠道分支ID'

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

@@ -3,6 +3,8 @@ package cn.freemud.entities.dto;
 import lombok.Data;
 import org.hibernate.validator.constraints.NotEmpty;
 
+import java.util.List;
+
 /**
  * All rights Reserved, Designed By www.freemud.cn
  *
@@ -25,4 +27,6 @@ public class QueryValidShareActivityReq {
     private String storeId;
     @NotEmpty(message = "appId不能为空")
     private String appId;
+    //组织ID
+    private List<String> orgIds;
 }

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

@@ -768,7 +768,14 @@ public class OrderServiceImpl implements Orderservice {
                     // 判断是否有裂变活动 订单扩展信息判断必须有wxappid
                     // 查询门店下有没有 裂变活动
                     Long orderTime = DateUtil.convert2Date(queryOrderResponseVo.getOrderCreateTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS).getTime();
-                    String activityId = isShareActivity(queryOrderVo.getPartnerId(), queryOrderResponseVo.getShopId(), queryOrderResponseVo.getWxappid(), orderTime == null ? 0 : orderTime, queryOrderResponseVo.getOid(), userId, queryOrderVo.getSessionId());
+                    StoreResponse.BizVO bizVO = storeMap.get(queryOrderResponseVo.getShopId());
+                    String activityId = isShareActivity(queryOrderVo.getPartnerId(), queryOrderResponseVo.getShopId()
+                            , queryOrderResponseVo.getWxappid()
+                            , orderTime == null ? 0 : orderTime
+                            , queryOrderResponseVo.getOid()
+                            , userId
+                            , queryOrderVo.getSessionId()
+                            , bizVO.getParentCode());
                     // 取红包图片
                     queryOrderResponseVo.setRedpacketsPicture(getRedpacketsPicture(activityId));
                     queryOrderResponseVo.setActivityId(activityId);
@@ -891,6 +898,7 @@ public class OrderServiceImpl implements Orderservice {
         request.setPartnerId(partnerId);
         request.setStoreCode(storeId);
         StoreResponse storeInfo = storeCenterService.getStoreInfo(request, LogTreadLocal.getTrackingNo());
+        String organizationId = "";
         if (storeInfo != null && storeInfo.getBizVO() != null) {
             StoreResponse.BizVO storeResponseDto = storeInfo.getBizVO();
             orderBean.setShopAddress(storeResponseDto.getAddress());
@@ -901,6 +909,7 @@ public class OrderServiceImpl implements Orderservice {
             orderBean.setShopPhone(storeResponseDto.getPhone());
             orderBean.setLatitude(Double.valueOf(storeResponseDto.getLatitude()));
             orderBean.setLongitude(Double.valueOf(storeResponseDto.getLongitude()));
+            organizationId = storeResponseDto.getParentCode();
         }
         //TODO 查询订单的排队人数
         orderBean.setQueueIndex("");
@@ -953,7 +962,7 @@ public class OrderServiceImpl implements Orderservice {
             OrderExtInfoDto orderExtInfoDto = gson.fromJson(extInfo, OrderExtInfoDto.class);
             String wxappid = orderExtInfoDto.getAppid();
             // 查询门店下有没有 裂变活动
-            String activityId = isShareActivity(partnerId, storeId, wxappid, response.getData().getGmtCreate(), oid, userId, sessionId);
+            String activityId = isShareActivity(partnerId, storeId, wxappid, response.getData().getGmtCreate(), oid, userId, sessionId,organizationId);
             queryOrderResponseVo.setActivityId(activityId);
             // 取红包图片
             queryOrderResponseVo.setRedpacketsPicture(getRedpacketsPicture(activityId));
@@ -997,13 +1006,16 @@ public class OrderServiceImpl implements Orderservice {
      * @param orderTime
      * @return
      */
-    private String isShareActivity(String partnerId, String storeId, String wxappid, Long orderTime, String bizId, String userId, String sessionId) {
+    private String isShareActivity(String partnerId, String storeId, String wxappid, Long orderTime, String bizId, String userId, String sessionId,String organizationId) {
 
         QueryValidShareActivityReq activityReq = new QueryValidShareActivityReq();
         activityReq.setAppId(wxappid);
         activityReq.setPartnerId(partnerId);
         activityReq.setStoreId(storeId);
         activityReq.setOrderId(bizId);
+        if (StringUtils.isNotBlank(organizationId)) {
+            activityReq.setOrgIds(Arrays.asList(organizationId));
+        }
         String activityId = Optional.ofNullable(promotionActivityClient.queryValidShareActivity(activityReq)).map(BaseResponse::getResult).map(Object::toString).orElse("");
 
         String nickName = Optional.ofNullable(customerInfoManager.getCustomerInfoByObject(sessionId)).map(AssortmentCustomerInfoVo::getNickName).orElse("");