cps 拼团

@@ -43,6 +43,7 @@ public class UnionShareOrders extends BaseBO {
 
     private Integer specialStatus;//1-正常点击订单，2-锁粉订单
     private Integer paymentType;//支付类型：1-在线支付  2-货到付款
+    private Integer activitiesId;//activitiesId为14的，表示为拼团订单
 
     public Integer getId() {
         return id;
@@ -228,6 +229,14 @@ public class UnionShareOrders extends BaseBO {
         this.cpsExtraActivityId = cpsExtraActivityId;
     }
 
+    public Integer getActivitiesId() {
+        return activitiesId;
+    }
+
+    public void setActivitiesId(Integer activitiesId) {
+        this.activitiesId = activitiesId;
+    }
+
     @Override
     public String toString() {
         return "UnionShareOrders{" +
@@ -254,6 +263,7 @@ public class UnionShareOrders extends BaseBO {
                 ", orderAmount=" + orderAmount +
                 ", specialStatus=" + specialStatus +
                 ", paymentType=" + paymentType +
+                ", activitiesId=" + activitiesId +
                 '}';
     }
 }
\ No newline at end of file

@@ -22,10 +22,11 @@
     <result column="order_amount" property="orderAmount" jdbcType="DECIMAL" />
     <result column="special_status" property="specialStatus" jdbcType="TINYINT" />
     <result column="payment_type" property="paymentType" jdbcType="TINYINT" />
+    <result column="activities_id" property="activitiesId" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, order_code,settlement_code, promote_uid,order_uid, status, last_order_amount, order_time, is_new, amount, create_time,
-    update_time,extra_activity_id,cps_extra_activity_id,activity_id,activity_name,extra_amount,order_amount,special_status,payment_type
+    update_time,extra_activity_id,cps_extra_activity_id,activity_id,activity_name,extra_amount,order_amount,special_status,payment_type,activities_id
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -106,13 +107,13 @@
     last_order_amount, order_time, is_new,
     amount, create_time, update_time,
     extra_activity_id,cps_extra_activity_id, activity_id,activity_name, extra_amount,
-    order_amount,special_status,payment_type)
+    order_amount,special_status,payment_type,activities_id)
     values (#{id,jdbcType=INTEGER}, #{orderCode,jdbcType=VARCHAR}, #{promoteUid,jdbcType=INTEGER},
     #{orderUid,jdbcType=INTEGER}, #{settlementCode,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR},
     #{lastOrderAmount,jdbcType=DECIMAL}, #{orderTime,jdbcType=INTEGER}, #{isNew,jdbcType=TINYINT},
     #{amount,jdbcType=DECIMAL}, #{createTime,jdbcType=INTEGER}, #{updateTime,jdbcType=INTEGER},
     #{extraActivityId,jdbcType=INTEGER},#{cpsExtraActivityId,jdbcType=INTEGER}, #{activityId,jdbcType=INTEGER},#{activityName,jdbcType=VARCHAR}, #{extraAmount,jdbcType=DECIMAL},
-    #{orderAmount,jdbcType=DECIMAL}), #{specialStatus,jdbcType=TINYINT}, #{paymentType,jdbcType=TINYINT}
+    #{orderAmount,jdbcType=DECIMAL}), #{specialStatus,jdbcType=TINYINT}, #{paymentType,jdbcType=TINYINT}, #{activitiesId,jdbcType=INTEGER}
   </insert>
   <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id"  parameterType="com.yoho.unions.dal.model.UnionShareOrders" >
     insert into union_share_orders
@@ -177,6 +178,9 @@
       <if test="paymentType != null" >
         payment_type,
       </if>
+      <if test="activitiesId != null" >
+        activities_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -239,6 +243,9 @@
       <if test="paymentType != null" >
         #{paymentType,jdbcType=TINYINT},
       </if>
+      <if test="activitiesId != null" >
+        #{activitiesId,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.yoho.unions.dal.model.UnionShareOrders" >

@@ -2313,8 +2313,9 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
                 return;
             }
             //拼团订单处理：0-不做处理，1-剔除拼团订单，2-拼团参与
-            if (activity.getCollage() == 1) {
-                //TODO
+            //activitiesId为14的，表示为拼团订单
+            if (((activity.getCollage() == 1 && 14 == order.getActivitiesId()) || (activity.getCollage() == 2 && 14 != order.getActivitiesId()))) {
+                return;
             }
             //这组skn作用：0-不筛选skn,1-指定可参与活动的skn,2-剔除可参与活动的skn
             if (activity.getNeedSkn() >0 && StringUtils.isNotBlank(activity.getSkns())) {
@@ -2334,8 +2335,9 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
                 if ((activity.getNeedSkn() == 1 && !containsSkn) || (activity.getNeedSkn() == 2 && containsSkn)) {
                     return;
                 }
-                lastOrders.add(order);
+
             }
+            lastOrders.add(order);
         });
         return lastOrders;
     }
@@ -2540,8 +2542,9 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
         }
 
         //1.4拼团订单处理：0-不做处理，1-剔除拼团订单，2-拼团参与
-        if (activity.getCollage() == 1) {
-            //TODO
+        //activitiesId为14的，表示为拼团订单
+        if ((activity.getCollage() == 1 && 14 == order.getActivitiesId()) || (activity.getCollage() == 2 && 14 != order.getActivitiesId())) {
+            return false;
         }
         //1.5这组skn作用：0-不筛选skn,1-指定可参与活动的skn,2-剔除可参与活动的skn
         if (activity.getNeedSkn() >0 && StringUtils.isNotBlank(activity.getSkns())) {