|
|
@@ -1756,7 +1756,7 @@ public class Order extends Controller {
|
|
|
}
|
|
|
if(rows.get(0).getLong("sa_promotionid")!=0){
|
|
|
if (dbConnect.runSqlQuery("SELECT 1 FROM sa_promotion WHERE CURRENT_TIME> enddate AND siteid='" + siteid + "' AND sa_promotionid='" + rows.get(0).getLong("sa_promotionid") + "'").isNotEmpty()) {
|
|
|
- return getErrReturnObject().setErrMsg("活动已结束,是否确认退回,退回后无法再次提交").toString();
|
|
|
+ //return getErrReturnObject().setErrMsg("活动已结束,是否确认退回,退回后无法再次提交").toString();
|
|
|
}
|
|
|
}
|
|
|
//通过版本更新订单表头数据
|