|
|
@@ -555,7 +555,7 @@ func UpdateActivitySattusToHaveInHand() (err error) {
|
|
|
condition += ` AND activity_time < NOW()`
|
|
|
sqlOr = condition
|
|
|
condition += ` AND (activity_type_id IN ( 1, 2, 3, 7 ) AND activity_time > ` + "'" + resultTime_30 + "'" + ")"
|
|
|
- condition += ` OR(activity_type_id IN ( 4, 5, 6 ) AND activity_time > ` + "'" + resultTime_60 + "'" + sqlOr + ")"
|
|
|
+ condition += ` OR(activity_type_id IN ( 4, 5, 6, 8 ) AND activity_time > ` + "'" + resultTime_60 + "'" + sqlOr + ")"
|
|
|
msql := " UPDATE cygx_activity SET active_state = 2 WHERE 1 = 1 " + condition
|
|
|
_, err = o.Raw(msql).Exec()
|
|
|
return
|
|
|
@@ -578,7 +578,7 @@ func UpdateActivitySattusToComplete() (err error) {
|
|
|
//condition += ` AND activity_time < NOW()`
|
|
|
//sqlOr = condition
|
|
|
condition += ` AND (activity_type_id IN ( 1, 2, 3, 7 ) AND activity_time < ` + "'" + resultTime_30 + "'" + ")"
|
|
|
- condition += ` OR(activity_type_id IN ( 4, 5, 6 ) AND activity_time < ` + "'" + resultTime_60 + "'" + ")"
|
|
|
+ condition += ` OR(activity_type_id IN ( 4, 5, 6 ,8 ) AND activity_time < ` + "'" + resultTime_60 + "'" + ")"
|
|
|
msql := " UPDATE cygx_activity SET active_state = 3 WHERE 1 = 1 " + condition
|
|
|
_, err = o.Raw(msql).Exec()
|
|
|
return
|
xingzai