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

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -1411,7 +1411,7 @@ public class Order extends Controller {
         //验证结算企业
         Long pay_enterpriseid = row.getLong("pay_enterpriseid");
         if (pay_enterpriseid <= 0) {
-            dbConnect.runSqlQuery("UPDATE sa_order set pay_enterpriseid=sys_enterpriseid  WHERE sa_orderid=" + sa_orderid);
+            dbConnect.runSqlUpdate("UPDATE sa_order set pay_enterpriseid=sys_enterpriseid  WHERE sa_orderid=" + sa_orderid);
 //            return getErrReturnObject().setErrMsg("请选择结算企业").toString();
         }
         Long sys_enterprise_financeid = row.getLong("sys_enterprise_financeid");

src/custom/restcontroller/webmanage/sale/order/OrderItemsHelper.java

@@ -414,18 +414,18 @@ public class OrderItemsHelper extends BaseClass {
                             if (!customschemeItem.getString("value").equals("spec")) {
                                 customproperties.add(customschemeItem.getString("description") + ":" + itemRowsMap.get(itemid).get(0).getString(customschemeItem.getString("value")));
                             } else {
-                                String material = "选项:" + item.getStringValue("material");
-                                String colors = "颜色:" + item.getStringValue("colors");
-                                String cheek = "工艺:" + item.getStringValue("cheek");
+                                String material = "选项:" + item.getStringValue("custommaterial");
+                                String colors = "颜色:" + item.getStringValue("customcolors");
+                                String cheek = "工艺:" + item.getStringValue("customcheek");
                                 String size = "尺寸:" + item.getStringValue("length") + "*" + item.getStringValue("width");
                                 customproperties.add(material +";"+ colors+";"+ cheek +";"+ size);
                             }
 
                         }
                     } else {
-                        String material = "选项:" + item.getStringValue("material");
-                        String colors = "颜色:" + item.getStringValue("colors");
-                        String cheek = "工艺:" + item.getStringValue("cheek");
+                        String material = "选项:" + item.getStringValue("custommaterial");
+                        String colors = "颜色:" + item.getStringValue("customcolors");
+                        String cheek = "工艺:" + item.getStringValue("customcheek");
                         String size = "尺寸:" + item.getStringValue("length") + "*" + item.getStringValue("width");
                         customproperties.add(material +";"+ colors+";"+ cheek +";"+ size);
                     }