|
|
@@ -314,6 +314,8 @@ public class promotion extends Controller {
|
|
|
sqlFactory.addParameter("associationaccountclassid", 0);
|
|
|
sqlFactory.addParameter("rebateratio", 0);
|
|
|
sqlFactory.addParameter("packagetype", row.getString("packagetype"));
|
|
|
+ sqlFactory.addParameter("eachneedadd", row.getLong("eachneedadd"));
|
|
|
+ sqlFactory.addParameter("eachlimitqty", row.getLong("eachlimitqty"));
|
|
|
// 备注说明
|
|
|
sqlFactory.addParameter("remarks", row.getString("remarks"));
|
|
|
sqlList.add(sqlFactory.getSQL());
|
|
|
@@ -554,6 +556,9 @@ public class promotion extends Controller {
|
|
|
return getErrReturnObject().setErrMsg("返利促销授权的经销商必须都为限购").toString();
|
|
|
}
|
|
|
}
|
|
|
+ if(!rows.get(0).getBoolean("authmethod") && dbConnect.runSqlQuery("select * from sa_promotion_auth where siteid='" + siteid + "' and sa_promotionid=" + sa_promotionid).isEmpty()){
|
|
|
+ return getErrReturnObject().setErrMsg("请添加范围内非授权经销商名单！").toString();
|
|
|
+ }
|
|
|
for (Row row:rowsdetails) {
|
|
|
if(row.getBigDecimal("orderminqty").compareTo(BigDecimal.ZERO)==0 || row.getBigDecimal("orderaddqty").compareTo(BigDecimal.ZERO)==0){
|
|
|
return getErrReturnObject().setErrMsg("该促销方案【"+row.getString("itemno")+"】商品起订量或增量为0，无法审核").toString();
|
