Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java

@@ -48,6 +48,8 @@ public class CreateOrderProductRequest extends BaseConfig {
      * 商品货号，商品服务可重复
      */
     private String productCode;
+
+
     /**
      * 商品价格 单价分
      */
@@ -201,6 +203,8 @@ public class CreateOrderProductRequest extends BaseConfig {
 
     private String classificationName;
 
+    private String category;
+
     private List<String> specialCodes;
 
     private List<OrderSpecialExtraAttrRequest> specialAttrs;

assortment-shoppingcart-sdk/readme.md

@@ -11,4 +11,5 @@
 | 1.1.3.RELEASE| 增加统计分类classificationId  ,setClassificationName  |  | 2020-06-16  |
 | 1.1.5.RELEASE| 商品加料    |  | 2020-08-24  |
 | 1.1.6.RELEASE| 新增商品券名称字段| 孙昱 | 2020-11-09 |
-| 1.1.7.RELEASE| 标识套餐类型| 孙昱 | 2020-12-01 |
+| 1.1.7.RELEASE| 标识套餐类型| 孙昱 | 2020-12-01 |
\ No newline at end of file
+| 1.1.8.RELEASE| 拼单| 缪晖 | 2020-12-10 |
\ No newline at end of file

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

@@ -1220,7 +1220,7 @@ public class OrderAdapter {
                 responseVo.setOidBase64Image(oidBase64Image);
             }
             //设置是否是第三方配送单
-            if (ordersBean.getAddInfo() !=null && StringUtils.isNotEmpty(ordersBean.getAddInfo().getDeliveryId())&& !"0".equals(ordersBean.getAddInfo().getDeliveryId())) {
+            if (ordersBean.getAddInfo() !=null && StringUtils.isNotEmpty(ordersBean.getAddInfo().getDeliveryId())&& "0".equals(ordersBean.getAddInfo().getDeliveryId())) {
                 responseVo.setHasThirdDelivery(true);
                 responseVo.setDeliveryId(ordersBean.getAddInfo().getDeliveryId());
             }
@@ -1390,7 +1390,6 @@ public class OrderAdapter {
             if (enableRefundCodes.contains(ordersBean.getStatus()) && PayStatus.HAVE_PAID.getCode().equals(ordersBean.getPayStatus())) {
                 responseVo.setEnableRefund(true);
             }
-            responseVo.setMarketingType(ordersBean.getMarketingType());
             list.add(responseVo);
         });
         return list;
@@ -2028,7 +2027,6 @@ public class OrderAdapter {
             productVos.sort(Comparator.comparing(ProductVo::getSequence));
             responseVo.setProducts(productVos);
             responseVo.setProductNum(productVos.stream().mapToInt(ProductVo::getQty).sum());
-            responseVo.setOrderUserNum(productVos.stream().filter(product -> StringUtils.isNotEmpty(product.getUserId())).map(ProductVo::getUserId).distinct().count());
         }
     }
 
@@ -2063,11 +2061,6 @@ public class OrderAdapter {
         productVo.setSequence(productBean.getSequence());
         productVo.setQty(productBean.getNumber());
         productVo.setSpecification("");
-        productVo.setUserId(productBean.getUserId());
-        productVo.setOpenId(productBean.getOpenId());
-        productVo.setNickName(productBean.getNickName());
-        productVo.setPhotoUrl(productBean.getPhotoUrl());
-        productVo.setPackPrice(productBean.getPackPrice());
         List<InventedParentActivityVo> inventedParentActivityVos = new ArrayList<>();
         String attributeNames = "";
         if (StringUtils.isNotBlank(productBean.getAddInfo()) && productBean.getAddInfo().contains("attributeNames")) {
@@ -2088,11 +2081,6 @@ public class OrderAdapter {
                 }
                 productVo.setInventedParentActivitiesVo(inventedParentActivityVos);
             }
-
-            // 购物车行id
-            productVo.setCid(orderProductAddInfoDto.getCartGoodsUid());
-            // 购物车行父id
-            productVo.setOcid(orderProductAddInfoDto.getOriginalGoodsUid());
         }
         productVo.setOriginalPrice(productBean.getPrice());
         productVo.setFinalPrice(productBean.getSalePrice());
@@ -2120,7 +2108,7 @@ public class OrderAdapter {
                 if (OrderAccountType.PRODUCT_COUPON.getCode().equals(productDiscount.getDiscountType())) {
                     hasProductCoupon = true;
                     Integer extendType = StringUtils.isBlank(productDiscount.getAddInfo())?null:JSON.parseObject(productDiscount.getAddInfo()).getInteger("extendType");
-                    if("啡常月享卡".equals(productDiscount.getDiscountDesc()) || (null != extendType && 4 == extendType)) {
+                    if(null != extendType && (3 == extendType || 4 == extendType || 5 == extendType)) {
                         productVo.setCouponName(productDiscount.getDiscountDesc());
                     } else {
                         productVo.setName(productDiscount.getDiscountDesc());
@@ -2346,6 +2334,10 @@ public class OrderAdapter {
         if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode() || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode())) {
             List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
             cartGoodsDetailDto.getComboProducts().forEach(product -> {
+                product.setUserId(cartGoodsDetailDto.getUserId());
+                product.setUserName(cartGoodsDetailDto.getUserName());
+                product.setOpenId(cartGoodsDetailDto.getOpenId());
+                product.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
                 comboProducts.add(convent2OrderProductDemo(product));
             });
             createOrderProductDemoDto.setComboProduct(comboProducts);
@@ -2354,6 +2346,10 @@ public class OrderAdapter {
         if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.MATERIALPRODUCT_UPPRICE.getCode())) {
             List<CreateOrderProductRequest> materialProducts = new ArrayList<>();
             cartGoodsDetailDto.getMaterialList().forEach(product -> {
+                product.setUserId(cartGoodsDetailDto.getUserId());
+                product.setUserName(cartGoodsDetailDto.getUserName());
+                product.setOpenId(cartGoodsDetailDto.getOpenId());
+                product.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
                 materialProducts.add(convent2OrderProductMaterial(product));
             });
             createOrderProductDemoDto.setMaterialProduct(materialProducts);
@@ -2369,14 +2365,11 @@ public class OrderAdapter {
         if(cartGoodsDetailDto.getProductType() != null) {
             if(cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode()
                     || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode()) {
-//                createOrderProductDemoDto.setPrice(0l);
+                createOrderProductDemoDto.setPrice(0l);
                 //套餐
                 List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
                 cartGoodsDetailDto.getComboProducts().forEach(product -> {
                     CreateOrderProductRequest createOrderComboProduct = convent2MCCafeOrderProductDemo(product, product.getProductType());
-                    if(!product.getIsFixedProduct()) {
-                        createOrderProductDemoDto.setPrice(createOrderProductDemoDto.getPrice()+product.getOriginalPrice());
-                    }
                     comboProducts.add(createOrderComboProduct);
                     if(CollectionUtils.isNotEmpty(product.getMaterialList())) {
                         //加料商品
@@ -2455,18 +2448,11 @@ public class OrderAdapter {
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
         createOrderProductDemoDto.setStapleFood(0);
+        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
         createOrderProductDemoDto.setTax(cartGoodsDetailDto.getTax());
         createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
         createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
         createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
-        createOrderProductDemoDto.setUserId(cartGoodsDetailDto.getUserId());
-        createOrderProductDemoDto.setOpenId(cartGoodsDetailDto.getOpenId());
-        createOrderProductDemoDto.setNickName(cartGoodsDetailDto.getUserName());
-        createOrderProductDemoDto.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
-        createOrderProductDemoDto.setPackPrice(cartGoodsDetailDto.getPackPrice());
-
-        createOrderProductDemoDto.setCartGoodsUid(cartGoodsDetailDto.getCartGoodsUid());
-        createOrderProductDemoDto.setOriginalGoodsUid(cartGoodsDetailDto.getOriginalGoodsUid());
         return createOrderProductDemoDto;
     }
 
@@ -2492,15 +2478,11 @@ public class OrderAdapter {
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
         createOrderProductDemoDto.setStapleFood(0);
+        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
         createOrderProductDemoDto.setTax(cartGoodsDetailDto.getTax());
         createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
         createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
         createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
-        createOrderProductDemoDto.setUserId(cartGoodsDetailDto.getUserId());
-        createOrderProductDemoDto.setOpenId(cartGoodsDetailDto.getOpenId());
-        createOrderProductDemoDto.setNickName(cartGoodsDetailDto.getUserName());
-        createOrderProductDemoDto.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
-        createOrderProductDemoDto.setPackPrice(cartGoodsDetailDto.getPackPrice());
         if(CollectionUtils.isNotEmpty(cartGoodsDetailDto.getSpecialExtra())) {
             createOrderProductDemoDto.setSpecialAttrs(new ArrayList<>());
             cartGoodsDetailDto.getSpecialExtra().stream().forEach(o -> {
@@ -2828,10 +2810,6 @@ public class OrderAdapter {
         }
         orderPayDto.setProducts(productBeans);
         orderPayDto.setPayCode(paymentRequest.getPayCode());
-        //抖音支付的payCode = 10066
-        if(OrderClientType.TIKTOKPAY.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())){
-            orderPayDto.setPayCode(PayChannelType.TIKTOKPAY.getEbcode());
-        }
         orderPayDto.setFoodOrderType(getFoodOrderType(orderBean.getOrderType()));
         return orderPayDto;
     }
@@ -2945,8 +2923,6 @@ public class OrderAdapter {
         }
         responseDto.setStatusCode(unifiedOrderResponse.getStatusCode());
         responseDto.setPayTransId(unifiedOrderResponse.getPayTransId());
-        responseDto.setThirdOrderToken(unifiedOrderResponse.getOrderToken());
-        responseDto.setThirdOrderId(unifiedOrderResponse.getOrderId());
         return responseDto;
     }
 
@@ -3606,58 +3582,6 @@ public class OrderAdapter {
         return deleteOrderDto;
     }
 
-    /**
-     * 初始化扣减活动库存请求对象
-     * add by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
-     * @return
-     */
-    private ActivityUpdateStockRequest initActivityUpdateStockRequest(List<ActivityDiscountsDto> activityDiscountsDtos) {
-        // 原逻辑只检测扣减库存不为空时调用，现改为扣减库存不为空或参加活动不为空时调用
-        ActivityUpdateStockRequest activityUpdateStockRequest = new ActivityUpdateStockRequest();
-        List<String> activityList = new ArrayList<>();
-        // 只记录订单级别的活动ID
-        if (CollectionUtils.isNotEmpty(activityDiscountsDtos)) {
-            activityList.addAll(activityDiscountsDtos.stream().filter(ad -> StringUtils.isNotBlank(ad.getActivityCode())).map(ActivityDiscountsDto::getActivityCode).distinct().collect(Collectors.toList()));
-        }
-        //设置活动编号
-        activityUpdateStockRequest.setActivityList(CollectionUtils.isNotEmpty(activityList) ? activityList : null);
-        return activityUpdateStockRequest;
-    }
-
-    /**
-     * svc卡支付+现金支付
-     * @param cashAmount
-     * @param svcAmount
-     * @param payChannelType
-     * @return
-     */
-    public List<OrderPayItemCreateReq> setOrderPayItem(BigDecimal cashAmount,BigDecimal svcAmount, Byte payChannelType){
-        List<OrderPayItemCreateReq> orderPayItemCreateReqs = new ArrayList<>(0);
-        OrderPayItemCreateReq orderPayItemCreateReqSvc = new OrderPayItemCreateReq();
-
-        //svc卡
-        orderPayItemCreateReqSvc.setPayAmount(svcAmount);
-        orderPayItemCreateReqSvc.setPayChannelType(PayChannelType.SVC.getIndex().intValue());
-        orderPayItemCreateReqSvc.setPayChannelName(PayChannelType.SVC.getName());
-        orderPayItemCreateReqSvc.setPayEbCode(PayChannelType.SVC.getEbcode());
-        orderPayItemCreateReqs.add(orderPayItemCreateReqSvc);
-        //现金支付
-        OrderPayItemCreateReq orderPayItemCreateReqOther = new OrderPayItemCreateReq();
-        orderPayItemCreateReqOther.setPayAmount(cashAmount);
-        orderPayItemCreateReqOther.setPayChannelType(PayChannelType.getByIndex(payChannelType).getIndex().intValue());
-        orderPayItemCreateReqOther.setPayChannelName(PayChannelType.getByIndex(payChannelType).getName());
-        orderPayItemCreateReqOther.setPayEbCode(PayChannelType.getByIndex(payChannelType).getEbcode());
-        orderPayItemCreateReqs.add(orderPayItemCreateReqOther);
-        return orderPayItemCreateReqs;
-    }
-
-    /**
-     * 混合支付预支付信息转换
-     * @param paymentRequest
-     * @param createPrepayRequestDto
-     * @param partnerPayOvertime
-     * @return
-     */
     public CombPayRequest convent2CombPayOrderRequest(String cardNo
             , QueryOrdersResponse.DataBean.OrderBean orderBean
             , PaymentRequest paymentRequest
@@ -3679,7 +3603,6 @@ public class OrderAdapter {
         orderPayDto.setAppId(paymentRequest.getWxAppId());
         orderPayDto.setPayCode(paymentRequest.getPayCode());
         orderPayDto.setVer("V1");
-        orderPayDto.setStoreName(orderBean.getShopName());
         orderPayDto.setPayTimeOutTime(StringUtils.defaultIfBlank(partnerPayOvertime, "30"));
         List<ProductVO> productVOS = new ArrayList<ProductVO>();
         if (CollectionUtils.isNotEmpty(orderBean.getProductList())) {
@@ -3770,4 +3693,22 @@ public class OrderAdapter {
         }
         return responseDto;
     }
+
+    /**
+     * 初始化扣减活动库存请求对象
+     * add by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
+     * @return
+     */
+    private ActivityUpdateStockRequest initActivityUpdateStockRequest(List<ActivityDiscountsDto> activityDiscountsDtos) {
+        // 原逻辑只检测扣减库存不为空时调用，现改为扣减库存不为空或参加活动不为空时调用
+        ActivityUpdateStockRequest activityUpdateStockRequest = new ActivityUpdateStockRequest();
+        List<String> activityList = new ArrayList<>();
+        // 只记录订单级别的活动ID
+        if (CollectionUtils.isNotEmpty(activityDiscountsDtos)) {
+            activityList.addAll(activityDiscountsDtos.stream().filter(ad -> StringUtils.isNotBlank(ad.getActivityCode())).map(ActivityDiscountsDto::getActivityCode).distinct().collect(Collectors.toList()));
+        }
+        //设置活动编号
+        activityUpdateStockRequest.setActivityList(CollectionUtils.isNotEmpty(activityList) ? activityList : null);
+        return activityUpdateStockRequest;
+    }
 }

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

@@ -29,7 +29,7 @@ public class SubscribeMessageRequest {
      * 5 字节小程序
      * 6 h5
      */
-    private Integer channel;
+    private Integer channel =1;
 
     /**
      * 配送异常提醒

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -170,6 +170,7 @@ public enum ResponseResult {
     COLLAGE_ORDER_CREATE_ERROR_NOT_EXIST("45070", "拼单信息不存在，无法创建订单"),
     COLLAGE_ORDER_CREATE_ERROR_PAYING("45071", "拼单正在支付，请勿重复提交"),
     COLLAGE_ORDER_CREATE_ERROR_PAYED("45072", "拼单已支付完成，请返回订单列表查看"),
+    STORE_SELF_ERROR("45069", "请选择截止营业时间大于45分钟下单"),
 
 
     /**

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

@@ -59,12 +59,14 @@ import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
+import com.freemud.sdk.api.assortment.order.enums.NewOrderType;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import lombok.extern.log4j.Log4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -110,7 +112,7 @@ public class CheckOrder {
     private MemberPropertyService memberPropertyService;
     @Autowired
     private ShoppingCartClient shoppingCartClient;
-//    @Autowired
+    //    @Autowired
 //    private OrderAdapter orderAdapter;
     @Autowired
     private StoreServiceImpl storeService;
@@ -133,6 +135,7 @@ public class CheckOrder {
 
     @Value("${coco.partnerId}")
     private String cocoPartnerId;
+
     /**
      * 下单会员相关校验
      */
@@ -193,8 +196,8 @@ public class CheckOrder {
             throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
         }
         //订单预约单检查
-        OrderCheckAdapter.check(createOrderVo, storeResponse);
 
+        OrderCheckAdapter.check(createOrderVo, storeResponse);
         StoreResponse.BizVO storeResponseDto = storeResponse.getBizVO();
         // 校验门店是否停业 1 营业 2 停业 3 繁忙置休
         if (storeResponseDto.getActiveFlag() == null || storeResponseDto.getActiveFlag() != 1) {
@@ -274,6 +277,23 @@ public class CheckOrder {
             } else {
                 storeDeliveryInfoDto = getNewStoreDeliveryInfo(storeResponseDto, config, appId, trackingNo);
             }
+            //coco自配送提前45分钟，禁止下单
+            if (cocoPartnerId.equals(createOrderVo.getPartnerId()) &&
+                    CreateOrderType.TAKE_OUT.getCode().equals(createOrderVo.getOrderType()) &&
+                    "self".equals(storeDeliveryInfoDto.getDeliveryType())
+            ) {
+                //即时单是下单时间，预约单是预约单时间
+                Date orderDate = createOrderVo.getExpectTime() != null
+                        ? DateUtil.convert2Date(createOrderVo.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)
+                        : new Date();
+                Date todayEnd = DateUtil.setEndDay(new Date());
+                boolean toDay = orderDate.before(todayEnd);
+                BusinessDate businessDate = getStoreBusinessDate(storeResponseDto, toDay);
+                boolean businessEndDate = (DateUtils.addMinutes(orderDate, 45).compareTo(businessDate.getEndDate()) <= 0);
+                if (businessEndDate) {
+                    throw new ServiceException(ResponseResult.STORE_SELF_ERROR);
+                }
+            }
             //todo : 这里不再支持从表中获取门店配送信息 改用接口方式调用
             //外卖起送条件（1:杯数，2:金额）
             if (!Arrays.asList(1, 2).contains(storeDeliveryInfoDto.getDeliveryCondition())) {
@@ -297,6 +317,22 @@ public class CheckOrder {
         return pushOrderTime;
     }
 
+    /**
+     * 获取门店营业时间
+     *
+     * @param storeResponseDto
+     * @param toDay            true 今日,false 明天
+     * @return
+     */
+    private BusinessDate getStoreBusinessDate(StoreResponse.BizVO storeResponseDto, boolean toDay) {
+        List<String> todayBusinessTimes = storeCenterService.getTodayBusinessTime(Integer.parseInt(storeResponseDto.getBusinessType()), storeResponseDto.getBusinessHoursDay());
+        if (CollectionUtils.isEmpty(todayBusinessTimes)) {
+            throw new ServiceException(ResponseResult.STORE_BUSINESS_HOUR_ERROR);
+        }
+        BusinessDate businessDate = getStoreBusinessDate(todayBusinessTimes.get(todayBusinessTimes.size() - 1), toDay);
+        return businessDate;
+    }
+
     public void checkOrderExpectTime(CreateOrderVo createOrderVo, StoreResponse.BizVO storeResponseDto, Date takeMealDateTime) {
         if (takeMealDateTime == null) {
             return;
@@ -706,19 +742,19 @@ public class CheckOrder {
             storeDeliveryInfoDto.setPushOrderTime(0);
         } else {
             //如果是coco查询配送服务判断是平台配送还是自配送
-            if(cocoPartnerId.equals(storeResponseDto.getPartnerId())){
+            if (cocoPartnerId.equals(storeResponseDto.getPartnerId())) {
                 GetDeliveryFlagRequest getDeliveryFlagRequest = new GetDeliveryFlagRequest();
                 getDeliveryFlagRequest.setPartnerId(storeResponseDto.getPartnerId());
                 getDeliveryFlagRequest.setStoreId(storeResponseDto.getStoreId());
-                DeliveryBaseResponse<GetDeliveryFlagResponseDto> deliveryBaseResponse =  deliveryFeiginClient.getThirdDeliveryFlag(getDeliveryFlagRequest);
-                if(deliveryBaseResponse.getCode() == 100 && deliveryBaseResponse.getData() != null && deliveryBaseResponse.getData().isThirdDeliveryFlag()){
+                DeliveryBaseResponse<GetDeliveryFlagResponseDto> deliveryBaseResponse = deliveryFeiginClient.getThirdDeliveryFlag(getDeliveryFlagRequest);
+                if (deliveryBaseResponse.getCode() == 100 && deliveryBaseResponse.getData() != null && deliveryBaseResponse.getData().isThirdDeliveryFlag()) {
                     storeDeliveryInfoDto.setDeliveryType("third");
                     storeDeliveryInfoDto.setPushOrderTime(0);
-                }else {
+                } else {
                     storeDeliveryInfoDto.setDeliveryType("self");
                     storeDeliveryInfoDto.setPushOrderTime(0);
                 }
-            }else{
+            } else {
                 if (ObjectUtils.equals(openPlatformIappWxappConfig.getTakeType(), 1)) {
                     storeDeliveryInfoDto.setDeliveryType("self");
                     storeDeliveryInfoDto.setPushOrderTime(0);
@@ -774,19 +810,19 @@ public class CheckOrder {
             storeDeliveryInfoDto.setPushOrderTime(0);
         } else {
             //如果是coco查询配送服务判断是平台配送还是自配送
-            if(cocoPartnerId.equals(storeResponseDto.getPartnerId())){
+            if (cocoPartnerId.equals(storeResponseDto.getPartnerId())) {
                 GetDeliveryFlagRequest getDeliveryFlagRequest = new GetDeliveryFlagRequest();
                 getDeliveryFlagRequest.setPartnerId(storeResponseDto.getPartnerId());
                 getDeliveryFlagRequest.setStoreId(storeResponseDto.getStoreId());
-                DeliveryBaseResponse<GetDeliveryFlagResponseDto> deliveryBaseResponse =  deliveryFeiginClient.getThirdDeliveryFlag(getDeliveryFlagRequest);
-                if(deliveryBaseResponse.getCode() == 100 && deliveryBaseResponse.getData() != null && deliveryBaseResponse.getData().isThirdDeliveryFlag()){
+                DeliveryBaseResponse<GetDeliveryFlagResponseDto> deliveryBaseResponse = deliveryFeiginClient.getThirdDeliveryFlag(getDeliveryFlagRequest);
+                if (deliveryBaseResponse.getCode() == 100 && deliveryBaseResponse.getData() != null && deliveryBaseResponse.getData().isThirdDeliveryFlag()) {
                     storeDeliveryInfoDto.setDeliveryType("third");
                     storeDeliveryInfoDto.setPushOrderTime(0);
-                }else {
+                } else {
                     storeDeliveryInfoDto.setDeliveryType("self");
                     storeDeliveryInfoDto.setPushOrderTime(0);
                 }
-            }else{
+            } else {
                 if (ObjectUtils.equals(openPlatformIappWxappConfig.getTakeType(), 1)) {
                     storeDeliveryInfoDto.setDeliveryType("self");
                     storeDeliveryInfoDto.setPushOrderTime(0);

order-application-service/src/test/java/cn.freemud/utils/DateUtilsTest.java

+package cn.freemud.utils;
+
+import cn.freemud.base.util.DateUtil;
+import org.apache.commons.lang.time.DateUtils;
+import org.junit.Test;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class DateUtilsTest {
+
+
+    @Test
+   public void testDateCompare() throws ParseException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date1 = sdf.parse("2020-12-30 00:00:00");
+        Date date2 = sdf.parse("2020-12-14 11:50:00");
+
+        System.out.println("date1 : " + sdf.format(date1));
+        System.out.println("date2 : " + sdf.format(date2));
+        System.out.println(date1.compareTo(date2));
+        if (date1.compareTo(date2) > 0) {
+            System.out.println("Date1 时间在 Date2 之后");
+        } else if (date1.compareTo(date2) < 0) {
+            System.out.println("Date1 时间在 Date2 之前");
+        } else if (date1.compareTo(date2) == 0) {
+            System.out.println("Date1 时间与 Date2 相等");
+        } else {
+            System.out.println("程序怎么会运行到这里?正常应该不会");
+        }
+
+         boolean x =(DateUtils.addMinutes(new Date(), 45).compareTo(date2) <= 0);
+        System.out.println(x);
+    }
+
+    @Test
+    public  void  testBefore() throws ParseException {
+
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date1 = sdf.parse("2020-12-30 00:00:00");
+        Date date = DateUtil.setEndDay(new Date());
+        String s = DateUtil.convert2String(date, "yyyy-MM-dd HH:mm:ss");
+        System.out.println(date.before(date1));
+    }
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/PaySuccessResp.java

@@ -26,7 +26,7 @@ public class PaySuccessResp {
     //总排队人数
     private Integer queueNumber;
     //取餐码
-    private Integer pickUpGoodsNo;
+    private String pickUpGoodsNo;
     //门店订单序号
     private Integer daySeq;
 

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -694,7 +694,9 @@ public class ShoppingCartConvertAdapter {
             productComboType = parentProductBean.getProductComboList().stream().filter(p -> ObjectUtils.equals(comboxGoods.getGoodsId(), p.getProductId())).findFirst().orElse(new ProductTypeBeanDTO.ProductComboType());
         } else {
             Map<String, ProductTypeBeanDTO.ProductGroupType.GroupDetailType> map = new HashMap<>();
-            parentProductBean.getProductGroupList().stream().map(t -> t.getGroupDetail()).forEach(group -> group.forEach(detailType -> map.put(detailType.getProductId(), detailType)));
+            if (CollectionUtils.isNotEmpty(parentProductBean.getAdditionalGroupList())){
+                parentProductBean.getProductGroupList().stream().map(t -> t.getGroupDetail()).forEach(group -> group.forEach(detailType -> map.put(detailType.getProductId(), detailType)));
+            }
             groupDetailType = map.get(comboxGoods.getGoodsId());
         }
 
@@ -871,14 +873,15 @@ public class ShoppingCartConvertAdapter {
                 //套餐可选商品
                 if (CollectionUtils.isNotEmpty(cartGoods.getProductGroupList())) {
                     for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods comboxGoods : cartGoods.getProductGroupList()){
+                        ProductTypeBeanDTO productBeanDTO = subProductTypeMap.get(comboxGoods.getSpuId());
                         //套餐子商品多规格商品
                         if(comboxGoods.getSpuId() != null && !comboxGoods.getSkuId().equals(comboxGoods.getSpuId()) ){
                             for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
-                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false);
+                                updateComboxGoodsInfoForMCoffee(productGroup, productBeanDTO, false);
                             }
                         }else {
                             for (com.freemud.sdk.api.assortment.shoppingcart.domain.CartGoods.ComboxGoods productGroup : cartGoods.getProductGroupList()) {
-                                updateComboxGoodsInfoForMCoffee(productGroup, spuProduct, false);
+                                updateComboxGoodsInfoForMCoffee(productGroup, productBeanDTO, false);
                             }
                         }
                     }

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

@@ -738,11 +738,12 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
      * 重新计算拼单购物车行总折扣金额
      */
     private void updateTotalDiscountAmount(ActivityCalculationDiscountResponseDto.CalculationDiscountResult calculationDiscountResult, ShoppingCartGoodsDto shoppingCartGoodsDto) {
-        if (null != shoppingCartGoodsDto && null != shoppingCartGoodsDto.getProducts() && null != calculationDiscountResult.getGoods()) {
+        if (null != shoppingCartGoodsDto && null != shoppingCartGoodsDto.getProducts() && null != calculationDiscountResult && null != calculationDiscountResult.getGoods()) {
             shoppingCartGoodsDto.getProducts().stream().forEach(product -> {
                 calculationDiscountResult.getGoods().stream().forEach(goods -> {
                     if (goods.getCartGoodsUid().equals(product.getCartGoodsUid())) {
-                        product.setTotalDiscountAmount(Integer.valueOf(String.valueOf(goods.getDiscountAmount())));
+                        long totalDiscountAmount = product.getOriginalPrice() * product.getQty() - goods.getRealAmount();
+                        product.setTotalDiscountAmount(Integer.valueOf(String.valueOf(totalDiscountAmount)));
                     }
                 });
             });

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

@@ -270,8 +270,11 @@ public class ShoppingCartMCoffeeServiceImpl {
                     isContinue= false;
                 }
                 if(StringUtils.isNotEmpty(goodsId) && StringUtils.isNotEmpty(couponCode) && isContinue
-                        && cartGoods.getName().equals("啡常搭") && CollectionUtils.isNotEmpty(cartGoods.getProductComboList()) && cartGoods.getProductComboList().size() == 1
-                        && CollectionUtils.isEmpty(cartGoods.getProductGroupList()) && cartGoods.getProductComboList().get(0).getSkuId().equals(goodsId)) {
+                        && cartGoods.getName().equals("啡常搭") && cartGoods.getGoodsType().equals(GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType())
+                        && CollectionUtils.isNotEmpty(cartGoods.getProductComboList()) && cartGoods.getProductComboList().size() == 1
+                        && cartGoods.getProductComboList().get(0).getSkuId().equals(goodsId)
+                        && CollectionUtils.isNotEmpty(cartGoods.getProductGroupList()) && cartGoods.getProductGroupList().size() == 1
+                        && cartGoods.getProductGroupList().get(0).getSkuId().equals("0") && cartGoods.getProductGroupList().get(0).getSkuName().equals("无")) {
                     // 如果购物车商品存在商品规格，替换时复制规格信息
                     if (CollectionUtils.isNotEmpty(cartGoods.getProductComboList().get(0).getSpecialExtra())) {
                         addShoppingCartGoodsRequestVo.setSpecialExtra(cartGoods.getProductComboList().get(0).getSpecialExtra());