cps

@@ -25,6 +25,12 @@ public class DateUtil {
 		return dateStr;
 	}
 
+	public static String getDateStrBySecond(int second, String format) {
+		Date date = getDateBySecond(second);
+		return dateToString(date, format);
+	}
+
+
 	public static String str2DateStr(String time, String preformat, String toformat) {
 		SimpleDateFormat format = new SimpleDateFormat(preformat);
 		Date d = null;

@@ -1394,7 +1394,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
             return null;
         }
         //
-        UnionShareOrders activityOrder = queryOrderActivity(unionShareOrders.getOrderUid(), unionShareOrders.getPromoteUid(), unionShareOrders.getActivityId());
+        UnionShareOrders activityOrder = queryOrderActivity(unionShareOrders.getOrderUid(), unionShareOrders.getPromoteUid(), unionShareOrders.getExtraActivityId());
         if (null == activityOrder) {
             return null;
         }
@@ -1726,6 +1726,7 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
                 logs.setPromoteUid(promoteUid);
                 logs.setOrderUid(orderUid);
                 unionShareOrdersActivityLogsMapper.insertSelective(logs);
+                updateMonthData(logs.getPromoteUid(),new HashSet<String>(){{add(DateUtil.getDateStrBySecond(now,"yyyyMM"));}});
                 return true;
             }
         }