Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -66,7 +66,8 @@
             trsc.company_name companyName,
             trsi.store_name  storeName,
             ci.customer_is_solve customerIsSolve,
-            od.batch_create_time  batchCreateTime
+            od.batch_create_time  batchCreateTime,
+            ao.admin_name  salesAdminName
         FROM
         (
             SELECT
@@ -157,6 +158,7 @@
         LEFT JOIN tb_rst_store_info trsi ON temp.sales_store_id = trsi.store_id
         LEFT JOIN tb_rst_order_batch od ON temp.sales_batch_id = od.batch_id
         LEFT JOIN tb_rst_customer_info ci ON temp.sales_customer_id = ci.customer_id
+        LEFT JOIN tb_rst_sys_admin ao ON temp.sales_admin_id = ao.admin_id
     </select>
 
   <!-- 订单集合 -->

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -100,7 +100,7 @@ public class AdminSalesOrderController {
         List<StoreInfo> listStoreInfo = storeInfoService.listStore(new StoreInfo());
         List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
         salesOrder.setSalesOrderItemList(null);
-
+        List<ProductColor> productColorList = productService.listproductAndColor(new ProductColor());
         StitchAttrUtil.getSa()
                 .addDatePro("yyyy-MM-dd HH:mm:ss","startDate","endDate")
                 .setModelAndView(salesOrder, mv, "/admin/salesOrder/list_order_page", pagedResult);
@@ -108,6 +108,7 @@ public class AdminSalesOrderController {
         mv.addObject("listStoreInfo",listStoreInfo);
         mv.addObject("logisticsInfoList",logisticsInfoList);
         mv.addObject("identity",identity);
+        mv.addObject("productColorList",productColorList);
         return mv;
     }
 

watero-rst-web/src/main/java/com/iamberry/rst/utils/ArraySort.java

@@ -0,0 +1,26 @@
+package com.iamberry.rst.utils;
+
+/**
+ * Created by Administrator on 2018/11/13.
+ */
+public class ArraySort implements  Runnable{
+    private String num;
+    public ArraySort(int num){
+        this.num = num+"";
+    }
+
+    public static void main(String[] args){
+        int[] nums = {11,3,998,5455,1,152,990};
+        for(int i = 0;i< nums.length;i++){
+            new Thread(new ArraySort(nums[i])).start();
+        }
+    }
+    public void run(){
+        try {
+            Thread.sleep(Integer.parseInt(num));
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        System.out.println(num);
+    }
+}

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/add_customer.ftl

@@ -71,6 +71,9 @@
     <a class="btn radius r"
        style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
        href="javascript:location.replace(location.href);" title="刷新"><i class="Hui-iconfont">&#xe68f;</i></a>
+    <a class="btn radius r"
+       style="line-height:1.6em;margin-top:3px;margin-right: 5px;background: #32a3d8;color: #fff;border:1px solid #32a3d8;"
+       href="javascript:history.back(-1);" title="后退"><i class="Hui-iconfont">&#xe6d4;</i></a>
 </nav>
 <article class="page-container" style="padding: 10px;">
     <div class="pd-20 cl">