合并换购券

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java

@@ -116,7 +116,6 @@ public class ActivityCalculationDiscountRequestDto {
          * 例如8折为80
          */
         private Integer memberDiscount;
-        private String couponCode;
         /**
          * 加料/套餐可选商品
          */

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

@@ -828,8 +828,6 @@ public class CouponServiceImpl implements CouponService {
         return dto;
     }
 
-    private final static String FORMAT_YYYY_DD_23_59_59 = "yyyy-MM-dd 23:59:59";
-
     /**
      * 领券
      * 领券不需要关心应用和点餐方式