Merge branch 'develop' of…

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

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2463,6 +2463,7 @@ public class OrderSdkAdapter {
                         index++;
                         material.setOpid(index);
                         material.setSpecification(material.getProductId());
+                        material.setSpecificationName(material.getProductName());
                         updateOrderItemAndSettlement(orderItemList, orderSettlementCreateReqList, material, partnerId, partnerProductId, true);
                     }
                 }

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

@@ -119,10 +119,10 @@ public class TimeSaleCalculation {
             if ((goods = goodsMap.get(cartGoods.getSkuId())) == null || ObjectUtils.equals(ActivityTypeEnum.TYPE_81.getCode(), cartGoods.getActivityType())) {
                 continue;
             }
-//            if(goods.getArtNo() == null){
-//                throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
-//            }
-//            cartGoods.setCustomerCode(goods.getArtNo());
+            if(goods.getArtNo() == null){
+                throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
+            }
+            cartGoods.setCustomerCode(goods.getArtNo());
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = getGoodsDiscount(goods.getDiscounts(), Arrays.asList(ActivityTypeEnum.TYPE_2.getCode(), ActivityTypeEnum.TYPE_21.getCode(), ActivityTypeEnum.TYPE_23.getCode()));
             if (goodsDiscount == null) {
                 continue;