|
@@ -1493,6 +1493,12 @@ public class Order extends Controller {
|
|
|
}
|
|
|
//促销订单:提交时商品必须是上架状态,并且活动方案中的商品必须也是上架状态,否则不允许提交
|
|
|
if (type.equals("促销订单")) {
|
|
|
+ Rows promotionauthRows = dbConnect.runSqlQuery("select * from sa_promotion_auth where sa_promotionid=" + sa_promotionid + " and sys_enterpriseid ='" + sys_enterpriseid + "' and siteid='" + siteid + "'");
|
|
|
+ if(promotionauthRows.isNotEmpty()){
|
|
|
+ if(promotionauthRows.get(0).getBoolean("settlestatus")){
|
|
|
+ return getErrReturnObject().setErrMsg("该促销活动已返利完结,无法提交,请删除或联系总部。").toString();
|
|
|
+ }
|
|
|
+ }
|
|
|
// orderItemsHelper.checkOffOrderItems(sa_orderid, "plm_item");
|
|
|
orderItemsHelper.checkOffOrderItems(sa_orderid, "sa_promotion_items", sa_promotionid);
|
|
|
}
|