Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/manager/logic/coupon/CouponLogic.java

@@ -184,6 +184,9 @@ public class CouponLogic {
         if (!CollectionUtils.isEmpty(couponBean.getCouponWebsitList()))
             couponBean.setBuyType("WEBSIT");
 
+   /*     if (couponService.lambdaQuery().eq(Coupon::getCouponName,couponBean.getCouponName()).count() > 0)
+            throw new RemoteServiceException("存在优惠券名称相同");
+*/
         couponService.save(couponBean);
         String couponId = couponBean.getCouponId();
 
@@ -409,6 +412,12 @@ public class CouponLogic {
         Coupon coupon = couponService.getById(couponBean.getCouponId());
         couponBean.setCreateTime(null);
 
+ /*       if (couponService.lambdaQuery().eq(Coupon::getCouponName,couponBean.getCouponName())
+                .ne(Coupon::getCouponId,couponBean.getCouponId())
+                .count() > 0)
+            throw new RemoteServiceException("存在优惠券名称相同");
+*/
+
         couponCompanyService.lambdaUpdate().eq(CouponCompany::getCouponId,coupon.getCouponId()).remove();
         for (CouponCompany couponCompany : couponBean.getCouponCompanyList()) {
             AdminCompany adminCompany = adminCompanyService.getById(couponCompany.getCompanyId());