Merge branch 'dev-coupon-recommend' into test6.9.6

@@ -6,7 +6,6 @@ import com.yohobuy.ufo.model.promotion.constant.CouponTypeEnum;
 import com.yohoufo.common.exception.UfoServiceException;
 import com.yohoufo.order.charge.coupon.CouponService;
 import com.yohoufo.order.charge.model.*;
-import com.yohoufo.order.constants.ApiVersionConfig;
 import com.yohoufo.order.service.support.DeliveryWayCostSupport;
 import com.yohoufo.order.service.support.ShoppingSupport;
 import com.yohoufo.order.utils.LoggerUtils;
@@ -17,6 +16,7 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 
 import static com.yohoufo.order.charge.model.ChargeParam.*;