revert 调整:创建券发放任务逻辑:券领取类型为`2-积分兑换`时不创建发放任务;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/candy/CandyMgtCouponAdminController.java

@@ -272,7 +272,7 @@ public class CandyMgtCouponAdminController extends BaseController {
                     }
                 }
                 break;
-            case 2:
+            case 2:// TODO: 2021/11/9 PM上线前临时加的发放类型（2-积分兑换）
                 buildParam.setEventType(0);
                 buildParam.setEventLimit(null);
                 break;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/candy/service/impl/CandyMgtCouponAdminServiceImpl.java

@@ -253,7 +253,8 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
         CandyMgtCoupon initMgtCoupon = new CandyMgtCoupon();
         initMgtCoupon.setMcouponId(IDGenerator.nextMilliId());
         initMgtCoupon.setCouponId(initCoupon.getCouponId());
-        initMgtCoupon.setState(0);
+//        initMgtCoupon.setState(0);
+        initMgtCoupon.setState(initCoupon.getBindType() == 2 ? 1 : 0);// TODO: 2021/11/9 PM上线前临时加的发放类型（2-积分兑换），这里根据发放类型设置该记录不执行发放
         initMgtCoupon.setEventAmt(parameter.getEventAmt());
         initMgtCoupon.setEventType(parameter.getEventType());
         initMgtCoupon.setEventLimit(parameter.getEventLimit());
@@ -274,17 +275,14 @@ public class CandyMgtCouponAdminServiceImpl extends ServiceImpl<CandyMgtCouponMa
     @Transactional
     public boolean saveMgtCouponInfo(CandyCoupon initCoupon, CandyMgtCoupon initMgtCoupon, List<CandyCouponRule> initCouponRuleList) {
         int insertCt = candyCouponMapper.insert(initCoupon);
-        boolean isScoreFlg = initCoupon.getBindType() != 2;
-        if (isScoreFlg) {// TODO: 2021/11/9 PM上线前临时加的发放类型（2-积分兑换），这里根据发放类型不创建发放任务
         insertCt += candyMgtCouponMapper.insert(initMgtCoupon);
-        }
 
         boolean saveBatch = true;
         if (!CollectionUtils.isEmpty(initCouponRuleList)) {
             saveBatch = candyCouponRuleAdminService.saveBatch(initCouponRuleList);
         }
 
-        if ((!isScoreFlg && insertCt < 1) || (isScoreFlg && insertCt < 2) || !saveBatch) {
+        if (insertCt < 2 || !saveBatch) {
             throw new LiquidnetServiceException();
         }