有赚推手 活动报名添加开关

@@ -214,6 +214,8 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
     private static final String SEND_MODE="unionsSendMode";
     private static final String SEND_MODE="unionsSendMode";
     // 优惠券金额
     // 优惠券金额
     private static final String COUPON_ACCOUNT="unionsCouponAccount";
     private static final String COUPON_ACCOUNT="unionsCouponAccount";
+    //推手是否需要报名 1 不需要 2需要
+    private String IS_NEED_SIGN_UP = "unionIsNeedSignUpFlag";
 
 
     /**
     /**
      * 获取用户可提现金额、已提现金额、是否可以提现
      * 获取用户可提现金额、已提现金额、是否可以提现
@@ -2811,12 +2813,17 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
             logger.info("joinExtraActivity end,canJoinActivity false,promoteUid is {},activityId is {}.",orderUid,promoteUid,activityId);
             logger.info("joinExtraActivity end,canJoinActivity false,promoteUid is {},activityId is {}.",orderUid,promoteUid,activityId);
             return false;
             return false;
         }
         }
-      /*  //满单额外返，需要报名才可以返佣
+
+
+       //满单额外返，需要报名才可以返佣
+        //读取配置项 1不需要报名 2 需要报名
+        String isOpen=configReader.getString(IS_NEED_SIGN_UP, "1");
+        if("2".equals(isOpen)){
             UnionShareOrdersActivityPagePre pagePre=unionOrdersActivityPagePreMapper.selectByUidAndActivityId(promoteUid, activityId);
             UnionShareOrdersActivityPagePre pagePre=unionOrdersActivityPagePreMapper.selectByUidAndActivityId(promoteUid, activityId);
             if (pagePre == null) {
             if (pagePre == null) {
                 return false;//未报名
                 return false;//未报名
-        }*/
-
+            }
+        }
         UnionShareOrdersActivity activity = queryActivity(activityId);
         UnionShareOrdersActivity activity = queryActivity(activityId);
         if (null == activity || activity.getType() != 3) {
         if (null == activity || activity.getType() != 3) {
             logger.info("joinExtraActivity end,activity error,orderUid is {},promoteUid is {},activityId is {},activity is {}.",orderUid,promoteUid,activityId,activity);
             logger.info("joinExtraActivity end,activity error,orderUid is {},promoteUid is {},activityId is {},activity is {}.",orderUid,promoteUid,activityId,activity);
@@ -3155,13 +3162,15 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
         }
         }
 
 
         //1.7 判断资格
         //1.7 判断资格
-//        if (type == 2) {
-//            // 加倍返，需要报名才可以返佣
-//            UnionShareOrdersActivityPagePre pagePre = unionOrdersActivityPagePreMapper.selectByUidAndActivityId(order.getPromoteUid(), activity.getId());
-//            if (pagePre == null) {
-//                return false;//未报名
-//            }
-//        }
+        //读取配置项 1不需要报名 2 需要报名
+        String isOpen=configReader.getString(IS_NEED_SIGN_UP, "1");
+        if (type == 2 && "2".equals(isOpen)) {
+            // 加倍返，需要报名才可以返佣
+            UnionShareOrdersActivityPagePre pagePre = unionOrdersActivityPagePreMapper.selectByUidAndActivityId(order.getPromoteUid(), activity.getId());
+            if (pagePre == null) {
+                return false;//未报名
+            }
+        }
         Integer id=null;
         Integer id=null;
         if (type == 6) {
         if (type == 6) {
             //邀新下单，需要有邀新记录且注册和下单时间差不超过7天才可以返佣
             //邀新下单，需要有邀新记录且注册和下单时间差不超过7天才可以返佣