会员不返回券开始结束时间取券码新加的返回时间

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

@@ -379,9 +379,9 @@ public class CouponDiscountCalculation {
                 detail.setActivityName(memberCoupon.getCouponName());
                 String startDate = "";
                 String endDate = "";
-                if(memberCoupon.getStartTime() != null && memberCoupon.getEndTime() != null){
-                    startDate = DateUtil.convert2String(DateUtil.convert2Date(memberCoupon.getStartTime(), DateUtil.FORMAT_yyyyMMdd_date), DateUtil.FORMAT_yyyyMMdd_date).replace("-", ".");
-                    endDate = DateUtil.convert2String(DateUtil.convert2Date(memberCoupon.getEndTime(), DateUtil.FORMAT_yyyyMMdd_date), DateUtil.FORMAT_yyyyMMdd_date).replace("-", ".");
+                if(couponStateVo.getValidStartTime() != null && couponStateVo.getValidEndTime() != null){
+                    startDate = DateUtil.convert2String(DateUtil.convert2Date(couponStateVo.getValidStartTime(), DateUtil.FORMAT_yyyyMMdd_date), DateUtil.FORMAT_yyyyMMdd_date).replace("-", ".");
+                    endDate = DateUtil.convert2String(DateUtil.convert2Date(couponStateVo.getValidEndTime(), DateUtil.FORMAT_yyyyMMdd_date), DateUtil.FORMAT_yyyyMMdd_date).replace("-", ".");
                 }
                 detail.setEndTime(endDate);
                 detail.setStartTime(startDate);

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

@@ -121,15 +121,15 @@ 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());
             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;
             }
-
+            //活动商品键位编号为空
+            if(CollectionUtils.isNotEmpty(goods.getDiscounts()) && StringUtils.isBlank(goods.getArtNo())){
+                throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
+            }
+            cartGoods.setCustomerCode(goods.getArtNo());
             Long totalDiscountAmount = goodsDiscount.getDiscount();
             ActivityDiscountsDto activityDiscountsDto = new ActivityDiscountsDto();
             activityDiscountsDto.setActivityCode(goodsDiscount.getActivityCode());

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

@@ -32,8 +32,13 @@ public class CouponState {
     private String limitType;
     private List<Product> productList;
 
+    //以下为麦咖啡新加字段
     private String actName;
 
     private String actDesc;
 
+    private String validEndTime;
+
+    private String validStartTime;
+
 }