Merge remote-tracking branch 'remotes/origin/feature/20210625-第二件优惠优惠数量' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-shoppingcart-sdk/pom.xml
#	assortment-shoppingcart-sdk/readme.md
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	shopping-cart-application-service/pom.xml

assortment-ordercenter-sdk/readme.md

@@ -147,4 +147,6 @@
 | 2.1.69-RELEASE |  麦咖啡一键下单  | 徐康 | 2021-06-10|
 | 2.1.70-RELEASE |  更新sdk  | 张跃 | 2021-06-17|
 | 2.1.71-RELEASE |  麦咖啡买赠和阶梯运费  | 徐康 | 2021-06-19|
-| 2.1.72-RELEASE |  券码所券  | 张跃 | 2021-06-21|
+| 2.1.72-RELEASE |  券码所券  | 张跃 | 2021-06-21|
\ No newline at end of file
+| 2.1.73-RELEASE |  预计送达时间逻辑添加  | 周晓航 | 2021-06-24|
+| 2.1.74-RELEASE |  麦咖啡p7v2  | xukang | 2021-06-24|
\ No newline at end of file

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -373,7 +373,7 @@ public class OrderAdapter {
                         goodsStockDTO.setBenefitSeq(goods.getBenefitSeq());
                         goodsStockDTO.setGoodsId(goods.getGoodsId());
                         int stock = goods.getStock() == null ? 1 : goods.getStock();
-                        goodsStockDTO.setStock(ActivityTypeEnum.TYPE_53.getCode().equals(stockVO.getActivityType()) ? 1 : stock);
+                        goodsStockDTO.setStock(stock);
                         goodsStockDTOS.add(goodsStockDTO);
                     });
                     stockBeanDto.setGoodsStock(goodsStockDTOS);
@@ -901,7 +901,7 @@ public class OrderAdapter {
                         goodsStockDTO.setBenefitSeq(goods.getBenefitSeq());
                         goodsStockDTO.setGoodsId(goods.getGoodsId());
                         int stock = goods.getStock() == null ? 1 : goods.getStock();
-                        goodsStockDTO.setStock(ActivityTypeEnum.TYPE_53.getCode().equals(stockVO.getActivityType()) ? 1 : stock);
+                        goodsStockDTO.setStock(stock);
                         goodsStockDTOS.add(goodsStockDTO);
                     });
                     stockBeanDto.setGoodsStock(goodsStockDTOS);
@@ -3620,7 +3620,7 @@ public class OrderAdapter {
                         goodsStockDTO.setBenefitSeq(goods.getBenefitSeq());
                         goodsStockDTO.setGoodsId(goods.getGoodsId());
                         int stock = goods.getStock() == null ? 1 : goods.getStock();
-                        goodsStockDTO.setStock(ActivityTypeEnum.TYPE_53.getCode().equals(stockVO.getActivityType()) ? 1 : stock);
+                        goodsStockDTO.setStock(stock);
                         goodsStockDTOS.add(goodsStockDTO);
                     });
                     stockBeanDto.setGoodsStock(goodsStockDTOS);

order-application-service/src/main/java/cn/freemud/service/CommonService.java

 package cn.freemud.service;
 
-import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.utils.SpringBeanUtil;
+import com.freemud.application.sdk.api.base.BaseResponse;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest;
+import com.freemud.application.sdk.api.storecenter.response.vo.GetOrgTreeListResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 public interface CommonService {
 
+    /**
+     * 获取organizationId集合
+     * @return
+     */
     default List<String> getOrgIds(String partnerId, String storeCode) {
         GetOrgTreeListRequest request = new GetOrgTreeListRequest();
         request.setPartnerId(partnerId);
         request.setStoreCode(storeCode);
         StoreCenterService storeCenterService = SpringBeanUtil.getBean(StoreCenterService.class);
-        com.freemud.application.sdk.api.base.BaseResponse<List<String>> orgList = storeCenterService.getOrgList(request, LogThreadLocal.getTrackingNo());
-        if (orgList != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(orgList.getCode())) {
-            return orgList.getData();
+        BaseResponse<GetOrgTreeListResponse> response  = storeCenterService.getOrgTreeList(request, LogThreadLocal.getTrackingNo());
+        if (Objects.equals("100", response.getCode()) && response.getData() != null) {
+            List<GetOrgTreeListResponse.OrgList> orgList = ((GetOrgTreeListResponse)response.getData()).getOrgList();
+            if (org.springframework.util.CollectionUtils.isEmpty(orgList)) {
+                return null;
+            } else {
+                List<String> orgIds = (List)orgList.stream().map(GetOrgTreeListResponse.OrgList::getOrganizationId).collect(Collectors.toList());
+                return orgIds;
+            }
+        } else {
+            return null;
         }
-        return null;
     }
 }

order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java

@@ -1320,7 +1320,7 @@ public abstract class UniversalOrderService {
                         goodsStockDTO.setBenefitSeq(goods.getBenefitSeq());
                         goodsStockDTO.setGoodsId(goods.getGoodsId());
                         int stock = goods.getStock() == null ? 1 : goods.getStock();
-                        goodsStockDTO.setStock(ActivityTypeEnum.TYPE_53.getCode().equals(stockVO.getActivityType()) ? 1 : stock);
+                        goodsStockDTO.setStock(stock);
                         goodsStockDTOS.add(goodsStockDTO);
                     });
                     stockBeanDto.setGoodsStock(goodsStockDTOS);

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

@@ -702,7 +702,7 @@ public class SaasMallOrderService extends UniversalOrderService {
                         goodsStockDTO.setBenefitSeq(goods.getBenefitSeq());
                         goodsStockDTO.setGoodsId(goods.getGoodsId());
                         int stock = goods.getStock() == null ? 1 : goods.getStock();
-                        goodsStockDTO.setStock(ActivityTypeEnum.TYPE_53.getCode().equals(stockVO.getActivityType()) ? 1 : stock);
+                        goodsStockDTO.setStock(stock);
                         goodsStockDTOS.add(goodsStockDTO);
                     });
                     stockBeanDto.setGoodsStock(goodsStockDTOS);

ordercenter-sdk/readme.md

@@ -90,4 +90,6 @@
 | 1.3.56.RELEASE | SDK问题 | 徐康 | 2021-05-20 |
 | 1.3.57.RELEASE | 新增食派士渠道 | 梁崇福 | 2021-05-25 |
 | 1.3.58.RELEASE | 多会员id分页查询 | 王航航 | 2021-06-01 |
-| 1.3.59.RELEASE | 取餐码迁移至聚合层 | 王航航 | 2021-06-07 |
+| 1.3.59.RELEASE | 取餐码迁移至聚合层 | 王航航 | 2021-06-07 |
\ No newline at end of file
+| 1.3.60.RELEASE | 预计送达时间字段添加 | 周晓航 | 2021-06-24 |
+| 1.3.61.RELEASE | 麦咖啡p7v2 | xukang | 2021-06-24 |
\ No newline at end of file

shopping-cart-application-service/src/main/java/cn/freemud/controller/ShoppingCartController.java

@@ -301,7 +301,7 @@ public class ShoppingCartController {
         for (String sessionId : request.getSessionIds()){
             AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(sessionId);
             cartParamDto.setUserId(assortmentCustomerInfoVo.getMemberId());
-            shoppingCartService.setCartGoodsListTest(cartParamDto, LogThreadLocal.getTrackingNo(),10, TimeUnit.MINUTES);
+            shoppingCartService.setCartGoodsListTest(cartParamDto, LogThreadLocal.getTrackingNo(),24, TimeUnit.HOURS);
         }
         return new BaseResponse("1","100","");
     }