Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml

assortment-ordercenter-sdk/pom.xml

@@ -55,7 +55,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>3.2.9-SNAPSHOT</version>
+            <version>3.1.9.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -80,6 +80,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Import;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -371,7 +372,9 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setCompleteOrderCode(confirmOrderRequest.getCompleteOrderCode());
         request.setOrderCode(confirmOrderRequest.getOrderId());
         // 引入门店基础服务 查询自动制作完成配置时间，预约单单独超时任务设置
-        request.setTimeout(getMCCafePaySuccessTimeout(confirmOrderRequest,request));
+        if(confirmOrderRequest.getTimeout() == null || confirmOrderRequest.getTimeout() == 0) {
+            request.setTimeout(getMCCafePaySuccessTimeout(confirmOrderRequest,request));
+        }
 
         if (!org.springframework.util.CollectionUtils.isEmpty(confirmOrderRequest.getOrderSettlements())) {
             List<OrderSettlementCreateReq> orderSettlementCreateReqs = new ArrayList<>();
@@ -572,7 +575,13 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             Random r = new Random();
             int minute = r.ints(1,31).findFirst().getAsInt() * 60000;
             String today = DateUtil.getCurrentDate(DateUtil.FORMAT_YMD);
+
             Date configTime = DateUtil.convert2Date(today+" "+timeOfRefund, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
+            // 判断当前时间是否已经超过门店设置的截至时间
+            if(new Date().after(configTime)){
+                today = DateUtil.convert2String(DateUtil.addDays(new Date(),1),DateUtil.FORMAT_YMD);
+                configTime = DateUtil.convert2Date(today+" "+timeOfRefund, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
+            }
             Date processingDate = new Date(configTime.getTime() + minute);
             String processingStr = DateUtil.convert2String(processingDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
             orderTask.setTaskTime(processingStr);

order-application-service/pom.xml

@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>3.2.9-SNAPSHOT</version>
+            <version>3.1.9.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

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

@@ -1244,7 +1244,7 @@ public class OrderAdapter {
                 responseVo.setAfterRefundInterval(false);
             }
             //商品信息转换
-            convent2ProductVos(ordersBean.getProductList(), responseVo);
+            convent2ProductVos(ordersBean.getProductList(), responseVo,ordersBean.getCompanyId());
             responseVo.setOrderAccounts(convent2OrderAccountVo(ordersBean.getApportionDetails()));
             if(CollectionUtils.isNotEmpty(ordersBean.getOrderCostDetailList())) {
                 ordersBean.getOrderCostDetailList().forEach(o -> {
@@ -1915,7 +1915,7 @@ public class OrderAdapter {
         return orderAccountVos;
     }
 
-    public void convent2ProductVos(List<QueryOrdersResponse.DataBean.OrderBean.ProductBean> productBeans, QueryOrderResponseVo responseVo) {
+    public void convent2ProductVos(List<QueryOrdersResponse.DataBean.OrderBean.ProductBean> productBeans, QueryOrderResponseVo responseVo,String partnerId) {
         if (CollectionUtils.isEmpty(productBeans)) {
             return;
         }
@@ -1950,16 +1950,28 @@ public class OrderAdapter {
                 }
                 if (ObjectUtils.equals(ProductTypeEnum.MATERIAL_PRODUCT.getCode(), productBean.getProductType())) {
                     List<ProductVo> setMaterialProducts = new ArrayList<>();
-                    productBean.getMaterialProduct().forEach(product -> {
-                        ProductVo material = convent2ProductVo(product);
-                        material.setOriginalTotalAmount(new BigDecimal(material.getOriginalPrice()).multiply(new BigDecimal(productVo.getQty())).longValue());
-                        material.setSaleTotalAmount(new BigDecimal(material.getFinalPrice()).multiply(new BigDecimal(productVo.getQty())).longValue());
-                        setMaterialProducts.add(material);
-                        productVo.setOriginalPrice(new BigDecimal(productVo.getOriginalPrice()).add(new BigDecimal(material.getOriginalPrice())).longValue());
-                        productVo.setFinalPrice(new BigDecimal(productVo.getFinalPrice()).add(new BigDecimal(material.getFinalPrice())).longValue());
-                        productVo.setOriginalTotalAmount(new BigDecimal(productVo.getOriginalTotalAmount()).add(new BigDecimal(material.getOriginalTotalAmount())).longValue());
-                        productVo.setSaleTotalAmount(new BigDecimal(productVo.getSaleTotalAmount()).add(new BigDecimal(material.getSaleTotalAmount())).longValue());
-                    });
+                    if(mcCafePartnerId.equals(partnerId)) {
+                        productBean.getMaterialProduct().forEach(product -> {
+                            ProductVo material = convent2ProductVo(product);
+                            setMaterialProducts.add(material);
+                            material.setOriginalTotalAmount(new BigDecimal(material.getOriginalPrice()).multiply(new BigDecimal(productVo.getQty())).longValue());
+                            material.setSaleTotalAmount(new BigDecimal(material.getFinalPrice()).multiply(new BigDecimal(productVo.getQty())).longValue());
+                            productVo.setOriginalPrice(new BigDecimal(productVo.getOriginalPrice()).add(new BigDecimal(material.getOriginalPrice())).longValue());
+                            productVo.setFinalPrice(new BigDecimal(productVo.getFinalPrice()).add(new BigDecimal(material.getFinalPrice())).longValue());
+                            productVo.setOriginalTotalAmount(new BigDecimal(productVo.getOriginalTotalAmount()).add(new BigDecimal(material.getOriginalTotalAmount())).longValue());
+                            productVo.setSaleTotalAmount(new BigDecimal(productVo.getSaleTotalAmount()).add(new BigDecimal(material.getSaleTotalAmount())).longValue());
+                        });
+                    }
+                    else {
+                            productBean.getMaterialProduct().forEach(product -> {
+                                ProductVo material = convent2ProductVo(product);
+                                setMaterialProducts.add(material);
+                                productVo.setOriginalPrice(new BigDecimal(productVo.getOriginalPrice()).subtract(new BigDecimal(material.getOriginalPrice())).longValue());
+                                productVo.setFinalPrice(new BigDecimal(productVo.getFinalPrice()).subtract(new BigDecimal(material.getFinalPrice())).longValue());
+                                productVo.setOriginalTotalAmount(new BigDecimal(productVo.getOriginalTotalAmount()).subtract(new BigDecimal(material.getOriginalTotalAmount())).longValue());
+                                productVo.setSaleTotalAmount(new BigDecimal(productVo.getSaleTotalAmount()).subtract(new BigDecimal(product.getSettlementPrice())).longValue());
+                            });
+                    }
                     productVo.setSetMaterialProducts(setMaterialProducts);
                 }
                 productVos.add(productVo);

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

@@ -870,6 +870,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         }
         if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
             var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+            if(OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getType()) || OldOrderType.EAT_IN.getCode().equals(orderBean.getType())) {
+                var1.setTimeout(-5);
+            }
         }
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccessMCCafe(var1);

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -839,7 +839,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             shoppingCartGoodsDto.setThresholdAmount(shoppingCartGoodsResponseVo.getThresholdAmount());
             shoppingCartGoodsDto.setIsDiscountDelivery(shoppingCartGoodsResponseVo.getIsDiscountDelivery());
             shoppingCartGoodsDto.setDiscountDeliveryActivityCode(shoppingCartGoodsResponseVo.getDiscountDeliveryActivityCode());
-            shoppingCartGoodsDto.setSendPoint(calculationDiscountResult.getSendPointVo());
+            if (calculationDiscountResult != null){
+                shoppingCartGoodsDto.setSendPoint(calculationDiscountResult.getSendPointVo());
+            }
+
         }
         return ResponseUtil.success(shoppingCartGoodsDto);
     }

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingEquallyService.java

@@ -92,23 +92,29 @@ public class CalculationSharingEquallyService {
          * 活动库存
          * 过滤出加价购
          */
-        List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> addMoneyDiscounts = discountResult.getDiscounts()
-                .stream()
-                .filter(discount -> ActivityTypeEnum.TYPE_81.getCode().equals(discount.getType()))
-                .collect(Collectors.toList());
+
         if (null != discountResult) {
+            List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> addMoneyDiscounts = discountResult.getDiscounts()
+                    .stream()
+                    .filter(discount -> ActivityTypeEnum.TYPE_81.getCode().equals(discount.getType()))
+                    .collect(Collectors.toList());
             List<SubtractStockVO> stocks = filterSendGoodsStocks(discountResult.getStocks(), shoppingCartInfoRequestVo, addMoneyDiscounts);
             if (CollectionUtils.isNotEmpty(stocks)) shoppingCartGoodsDto.setStocks(stocks);
         }
-
-        List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods = discountResult.getGoods();
+        List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods> goods = null;
+        if (discountResult !=null) {
+            goods = discountResult.getGoods();
+        }
 
         /**
          * 利用促销赋值totalDiscountAmount
          */
         shoppingCartGoodsResponseVo.setProducts(cartGoodsList);
+        CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods find = null;
         for (CartGoods product : shoppingCartGoodsResponseVo.getProducts()) {
-            CalculationSharingDiscountResponseDto.CalculationDiscountResult.Goods find = goods.stream().filter((k) -> k.getCartGoodsUid().equals(product.getCartGoodsUid())).findFirst().get();
+            if (goods!=null) {
+                find = goods.stream().filter((k) -> k.getCartGoodsUid().equals(product.getCartGoodsUid())).findFirst().get();
+            }
             ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = calculationCommonService.convertCartGoods2DetailGoodsList(find, product);
             cartGoodsDetailDtoList.add(cartGoodsDetailDto);
         }
@@ -135,8 +141,9 @@ public class CalculationSharingEquallyService {
 
         calculationCommonService.setAddAndUpdateResponse(cartGoodsList, shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo, ShoppingCartConstant.QUERY_INFO);
         calculationCommonService.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
-
-        shoppingCartGoodsDto.setSendPoint(discountResult.getSendPointVo());
+        if (discountResult!=null && discountResult.getSendPointVo()!=null) {
+            shoppingCartGoodsDto.setSendPoint(discountResult.getSendPointVo());
+        }
         shoppingCartGoodsDto.setDeliveryAmount(shoppingCartGoodsResponseVo.getDeliveryAmount());
         shoppingCartGoodsDto.setDiscountDeliveryAmount(shoppingCartGoodsResponseVo.getDiscountDeliveryAmount());
         shoppingCartGoodsDto.setThresholdAmount(shoppingCartGoodsResponseVo.getThresholdAmount());