加倍返和额外返活动需报名才可返佣

@@ -72,6 +72,7 @@ import com.yoho.unions.utils.ImagesHelper;
 
 /**
  * 联盟红人推广返利
+ * 有货有赚达人改名有货推手
  * Created by mingdan.ge on 2018/5/10.
  */
 @Service
@@ -111,8 +112,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
     UnionShareMessageMapper unionShareMessageMapper;
     @Autowired
     UnionShareYohoUserMapper unionShareYohoUserMapper;
-    @Autowired
-    UnionUicRegisterMapper unionUicRegisterMapper;
+
     @Autowired
     SendMessageHelper sendMessageHelper;
 
@@ -196,9 +196,9 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
 
     private static final int RANK_LIST_MAX_NUM = 50;
 
-    private static final String UNION_SHARE_USER_APPLY_PASS_SMS_CONTENT = "恭喜您，成为有货有赚达人！关注“有货有赚”公众号，获取最新赚佣活动！";
+    private static final String UNION_SHARE_USER_APPLY_PASS_SMS_CONTENT = "恭喜您，成为有货推手！关注“有货推手”公众号，获取最新推手活动！";
 
-    private static final String UNION_SHARE_USER_APPLY_REJECT_SMS_CONTENT = "真抱歉，您填写信息有误未能通过审核！关注“有货有赚”公众号，重新提交申请";
+    private static final String UNION_SHARE_USER_APPLY_REJECT_SMS_CONTENT = "真抱歉，您填写信息有误未能通过审核！关注“有货推手”公众号，重新提交申请";
 
     private final String yohoCardUrlPre = "http://yhgidcard.static.yhbimg.com/yohocard";
     private long EXPIRE_TIME = 3 * 24 * 3600;
@@ -2681,6 +2681,11 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
             logger.info("joinExtraActivity end,canJoinActivity false,promoteUid is {},activityId is {}.",orderUid,promoteUid,activityId);
             return false;
         }
+        //满单额外返，需要报名才可以返佣
+        UnionShareOrdersActivityPagePre pagePre=unionOrdersActivityPagePreMapper.selectByUidAndActivityId(promoteUid, activityId);
+        if (pagePre == null) {
+            return false;//未报名
+        }
 
         UnionShareOrdersActivity activity = queryActivity(activityId);
         if (null == activity || activity.getType() != 3) {
@@ -2987,14 +2992,19 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
         if (order.getLastOrderAmount().compareTo(activity.getOrderAmount()) < 0) {
             return false;
         }
+        //1.4 加倍返，需要报名才可以返佣
+        UnionShareOrdersActivityPagePre pagePre=unionOrdersActivityPagePreMapper.selectByUidAndActivityId(order.getPromoteUid(), activity.getId());
+        if (pagePre == null) {
+            return false;//未报名
+        }
 
-        //1.4拼团订单处理：0-不做处理，1-剔除拼团订单，2-拼团参与
+        //1.5 拼团订单处理：0-不做处理，1-剔除拼团订单，2-拼团参与
         //activitiesId为14的，表示为拼团订单
         if ((activity.getCollage() == 1 && order.getActivitiesId() != null && 14 == order.getActivitiesId())
                 || (activity.getCollage() == 2 && (order.getActivitiesId() == null||14 != order.getActivitiesId()))) {
             return false;
         }
-        //1.5这组skn作用：0-不筛选skn,1-指定可参与活动的skn,2-剔除可参与活动的skn
+        //1.6 这组skn作用：0-不筛选skn,1-指定可参与活动的skn,2-剔除可参与活动的skn
         if (activity.getNeedSkn() >0 ) {
             List<UnionShareOrdersProduct> unionShareOrdersProductlist = unionShareOrdersProductMapper.selectOrdersProductByOrderCode(order.getOrderCode());