Merge remote-tracking branch 'origin/develop-green' into develop-yellow

src/custom/restcontroller/webmanage/sale/accountclass/SQL/营销账户类型列表查询.sql

@@ -4,6 +4,7 @@ select t1.sa_accountclassid,
        isorder,
        isused,
        isrebate,
+       ispay,
        t1.bindingcategories,
        t1.maximumdiscount,
        ifnull(t2.balance, 0)     balance,

src/custom/restcontroller/webmanage/sale/accountclass/SQL/营销账户类型新增.sql

@@ -6,7 +6,8 @@ INSERT INTO sa_accountclass (sa_accountclassid,
                                   isused,
                                   isrebate,
                                   bindingcategories,
-                                  maximumdiscount)
+                                  maximumdiscount,
+                             ispay)
 VALUES ($sa_accountclassid$,
         $siteid$,
         $accountno$,
@@ -15,7 +16,8 @@ VALUES ($sa_accountclassid$,
         0,
         $isrebate$,
         $bindingcategories$,
-        $maximumdiscount$)
+        $maximumdiscount$,
+        $ispay$)
 
 
 

src/custom/restcontroller/webmanage/sale/accountclass/SQL/营销账户类型更新.sql

@@ -5,5 +5,6 @@ SET accountno=$accountno$,
     isrebate=$isrebate$,
     isused=$isused$,
     bindingcategories=$bindingcategories$,
-    maximumdiscount=$maximumdiscount$
+    maximumdiscount=$maximumdiscount$,
+    ispay=$ispay$
 WHERE sa_accountclassid = $sa_accountclassid$ 

src/custom/restcontroller/webmanage/sale/accountclass/accountclass.java

@@ -41,6 +41,10 @@ public class accountclass extends Controller {
         boolean isrebate = content.getBooleanValue("isrebate");
         JSONArray bindingcategories = content.getJSONArray("bindingcategories");
         BigDecimal maximumdiscount = content.getBigDecimalValue("maximumdiscount");
+        boolean ispay = true;
+        if (content.containsKey("ispay")) {
+            ispay = content.getBooleanValue("ispay");
+        }
 
         if (dbConnect.runSqlQuery("SELECT * from  sa_accountclass WHERE accountname='" + accountname + "' and siteid='" + siteid + "' and  sa_accountclassid!=" + sa_accountclassid).isNotEmpty()) {
             return getErrReturnObject().setErrMsg("账户名称已存在").toString();
@@ -65,6 +69,7 @@ public class accountclass extends Controller {
             sqlAddFactory.addParameter("accountname", accountname);
             sqlAddFactory.addParameter("isorder", isorder);
             sqlAddFactory.addParameter("isrebate", isrebate);
+            sqlAddFactory.addParameter("ispay", ispay);
             sqlAddFactory.addParameter("maximumdiscount", maximumdiscount);
             sqlAddFactory.addParameter("bindingcategories", bindingcategories);
             content.put("sa_accountclassid", sa_accountclassid);
@@ -100,6 +105,7 @@ public class accountclass extends Controller {
                 sqlUpdateFactory.addParameter("isorder", isorder);
                 sqlUpdateFactory.addParameter("isused", content.getInteger("isused"));
                 sqlUpdateFactory.addParameter("isrebate", isuserdRows.get(0).getInteger("isrebate"));
+                sqlUpdateFactory.addParameter("ispay", ispay);
                 sqlUpdateFactory.addParameter("maximumdiscount", maximumdiscount);
                 sqlUpdateFactory.addParameter("bindingcategories", bindingcategories);
             } else {
@@ -111,6 +117,7 @@ public class accountclass extends Controller {
                 sqlUpdateFactory.addParameter("isorder", isorder);
                 sqlUpdateFactory.addParameter("isused", content.getInteger("isused"));
                 sqlUpdateFactory.addParameter("isrebate", isrebate);
+                sqlUpdateFactory.addParameter("ispay", ispay);
                 sqlUpdateFactory.addParameter("maximumdiscount", maximumdiscount);
                 sqlUpdateFactory.addParameter("bindingcategories", bindingcategories);
             }

src/custom/restcontroller/webmanage/sale/itempriceadjust/ItempriceadjustItemprice.java

@@ -282,7 +282,10 @@ public class ItempriceadjustItemprice extends Controller {
             boolean iserr = false;
             Rows rowserr = new Rows();
             Rows rowssuc = new Rows();
-            RowsMap itemnoRowsMap = dbConnect.runSqlQuery("select itemid,itemno,marketprice from plm_item where siteid='" + siteid + "' and itemno in " + itemnoList.toString().replace("[", "(").replace("]", ")")).toRowsMap("itemno");
+            QuerySQL querySQL = SQLFactory.createQuerySQL(this, "plm_item", "itemid", "itemno", "marketprice");
+            querySQL.setSiteid(siteid);
+            querySQL.setWhere("itemno", itemnoList);
+            RowsMap itemnoRowsMap = querySQL.query().toRowsMap("itemno");
             for (Row row : rows) {
                 if (StringUtils.isEmpty(row.getString("itemno"))) {
                     iserr = true;
@@ -294,7 +297,6 @@ public class ItempriceadjustItemprice extends Controller {
                     if (itemnoRowsMap.containsKey(itemno)) {
                         row.put("itemid", itemnoRowsMap.get(itemno).get(0).getLong("itemid"));
                         row.put("oldmarketprice", itemnoRowsMap.get(itemno).get(0).getBigDecimal("marketprice"));
-                        rowssuc.add(row);
                     } else {
                         iserr = true;
                         row.put("msg", "错误信息:不存在商品编号为" + itemno + "的商品");
@@ -311,7 +313,9 @@ public class ItempriceadjustItemprice extends Controller {
                     iserr = true;
                     row.put("msg", "错误信息:商品调整价不能为空");
                     rowserr.add(row);
+                    continue;
                 }
+                rowssuc.add(row);
 
             }
 

src/custom/restcontroller/webmanage/sale/paybill/Paybill.java

@@ -333,6 +333,9 @@ public class Paybill extends Controller {
                 where.append(" and(accountname like'%").append(whereObject.getString("condition")).append("%'");
                 where.append(" or accountno like '%").append(whereObject.getString("condition")).append("%')");
             }
+            if (whereObject.containsKey("ispay") && !"".equals(whereObject.getString("ispay"))) {
+                where.append(" and (ispay =").append(whereObject.getBooleanValue("ispay")).append(")");
+            }
         }
         SQLFactory sqlFactory = new SQLFactory(this, "营销账户类型列表查询");
         sqlFactory.addParameter("siteid", siteid);