促销活动的EXCEL表价格导入，导入后小数点问题修复

src/custom/restcontroller/webmanage/sale/promotion/promotionItems.java

@@ -359,10 +359,10 @@ public class promotionItems extends Controller {
                 Row item = itemRowsMap.get(itemno).get(0);
                 row.put("itemid", item.getLong("itemid"));
                 if (StringUtils.isEmpty(orderminqty) || orderminqty.equals("0")) {
-                    row.put("orderminqty", item.getBigDecimal("orderminqty"));
+                    row.put("orderminqty", item.getDouble("orderminqty"));
                 }
                 if (StringUtils.isEmpty(orderaddqty) || orderaddqty.equals("0")) {
-                    row.put("orderaddqty", item.getBigDecimal("orderaddqty"));
+                    row.put("orderaddqty", item.getDouble("orderaddqty"));
                 }
                 if (StringUtils.isEmpty(groupqty) || groupqty.equals("0")) {
                     row.put("groupqty", "0");
@@ -371,25 +371,25 @@ public class promotionItems extends Controller {
                     row.put("islimit", "1");
                 }
                 if (StringUtils.isEmpty(price1) || price1.equals("0")) {
-                    row.put("price1", item.getBigDecimal("price1"));
+                    row.put("price1", item.getDouble("price1"));
                 }
                 if (StringUtils.isEmpty(price2) || price2.equals("0")) {
-                    row.put("price2", item.getBigDecimal("price2"));
+                    row.put("price2", item.getDouble("price2"));
                 }
                 if (StringUtils.isEmpty(price3) || price3.equals("0")) {
-                    row.put("price3", item.getBigDecimal("price3"));
+                    row.put("price3", item.getDouble("price3"));
                 }
                 if (StringUtils.isEmpty(price4) || price4.equals("0")) {
-                    row.put("price4", item.getBigDecimal("price4"));
+                    row.put("price4", item.getDouble("price4"));
                 }
                 if (StringUtils.isEmpty(price5) || price5.equals("0")) {
-                    row.put("price5", item.getBigDecimal("price5"));
+                    row.put("price5", item.getDouble("price5"));
                 }
-                row.put("oldprice1", item.getBigDecimal("price1"));
-                row.put("oldprice2", item.getBigDecimal("price2"));
-                row.put("oldprice3", item.getBigDecimal("price3"));
-                row.put("oldprice4", item.getBigDecimal("price4"));
-                row.put("oldprice5", item.getBigDecimal("price5"));
+                row.put("oldprice1", item.getDouble("price1"));
+                row.put("oldprice2", item.getDouble("price2"));
+                row.put("oldprice3", item.getDouble("price3"));
+                row.put("oldprice4", item.getDouble("price4"));
+                row.put("oldprice5", item.getDouble("price5"));
                 rowssuc.add(row);
             }
             if (iserr) {

src/custom/service/DispatchAutoCloseService.java

@@ -160,6 +160,15 @@ public class DispatchAutoCloseService extends ServiceController {
                         if (totalRowsMap.get(row.getString("sa_orderid")).get(0).getLong("count") == deliRowsMap.get(row.getString("sa_orderid")).get(0).getLong("count")) {
                             logger.info("订单关闭:update sa_order set status='关闭',closedate=current_time,closeby='admin' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='CCYOSG'");
                             dbConnect.runSqlUpdate("update sa_order set status='关闭',closedate=current_time,closeby='admin' where sa_orderid=" + row.getLong("sa_orderid") + " and siteid='CCYOSG'");
+                            SQLFactory sqlFactory = new SQLFactory(new DataContrlLog(), "数据操作日志新增");
+                            sqlFactory.addParameter("ownertable", "sa_order");
+                            sqlFactory.addParameter("ownerid",  row.getLong("sa_orderid"));
+                            sqlFactory.addParameter("action", "自动关闭");
+                            sqlFactory.addParameter("remarks", "订单数量发完自动关闭");
+                            sqlFactory.addParameter("actionuserid", "1");
+                            sqlFactory.addParameter("actionby", "admin");
+                            sqlFactory.addParameter("siteid", "CCYOSG");
+                            dbConnect.runSqlUpdate(sqlFactory.getSQL());
                         }
                     }
                 }