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

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -122,9 +122,10 @@ public class SalesOrder implements Serializable {
 
     private Integer isCustmerAddOrder;  //是否是客诉添加的订单  1：是   2：不是  只用于查询，不用于添加修改，为2查询所有不是客诉的订单
 
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date salesDistributionTime;//通知配货时间
 
-
     private String procTypeName;//
     private String procTypeId;//
 

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

@@ -1342,7 +1342,7 @@
             DATE_FORMAT(oi.sales_create_time,'%Y-%m-%d')
         FROM tb_rst_sales_order_info oi
         WHERE oi.sales_status = 1
-        AND (oi.sales_shipping_status  = 11 OR oi.sales_deliver = 1)
+        AND (oi.sales_shipping_status  = 11 OR (oi.sales_shipping_status = 1 AND oi.sales_deliver = 1))
         AND DATE_FORMAT(oi.sales_create_time,'%Y-%m-%d') < DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 day),'%Y-%m-%d')
         AND  oi.sales_batch_id != 'KS00000000000001'
         GROUP BY DATE_FORMAT(oi.sales_create_time,'%Y-%m-%d')

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -745,6 +745,10 @@ public class AdminCustomerController {
             return rjx;
         }
 
+        customerInfo.setCustomerTel(customerInfo.getCustomerTel().trim());
+        cmRelation.setRelationBackTel(cmRelation.getRelationBackTel().trim());
+        cmRelation.setRelationSendTel(cmRelation.getRelationSendTel().trim());
+
         Integer customerIsSolve = customerInfo.getCustomerIsSolve();    //处理类型
         String phone = customerInfo.getCustomerTel();       //手机号码
         Integer typeCompany = customerInfo.getTypeCompany();    // 所属商城   1:美国watero； 2:上朵电动牙刷  3:优尼雅净水机
@@ -861,6 +865,10 @@ public class AdminCustomerController {
         }
         Integer flag = 0;
 
+        customerInfo.setCustomerTel(customerInfo.getCustomerTel().trim());
+        cmRelation.setRelationBackTel(cmRelation.getRelationBackTel().trim());
+        cmRelation.setRelationSendTel(cmRelation.getRelationSendTel().trim());
+
         Integer customerIsSolve = customerInfo.getCustomerIsSolve();    //处理类型
         String phone = customerInfo.getCustomerTel();       //手机号码
         Integer typeCompany = customerInfo.getTypeCompany();    // 所属商城   1:美国watero； 2:上朵电动牙刷  3:优尼雅净水机

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

@@ -644,6 +644,9 @@ public class AdminSalesOrderController {
         SalesOrder salesOrder,
         String orderItemString
     ) throws Exception {
+
+        salesOrder.setSalesAddressTel(salesOrder.getSalesAddressTel().trim());
+
         Admin admin = AdminUtils.getLoginAdmin();
         ResponseJson rj = new ResponseJson();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -806,6 +809,9 @@ public class AdminSalesOrderController {
                                       SalesOrder salesOrder,
                                       String orderItemString
     ) throws Exception {
+
+        salesOrder.setSalesAddressTel(salesOrder.getSalesAddressTel().trim());
+
         JSONArray jsonArray = JSONArray.fromObject(orderItemString);
         List salesOrderItemList = ((List)JSONArray.toCollection(jsonArray, SalesOrderItem.class));
         for (Object temp:salesOrderItemList) {

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

@@ -599,7 +599,7 @@ public class AwaitSendController {
         yerterMap.put("list",yesterDayList);
         allList.add(yerterMap);
 
-        List<Date> dateList = salesOrderService.getNotSendDate();
+        List<Date> dateList = salesOrderService.getNotSendDate();   //2019-01-22
 
         Collections.reverse(dateList);
         for (Date date: dateList) {
@@ -886,6 +886,7 @@ public class AwaitSendController {
         titles.add("销售公司名称");
         titles.add("店铺名称");
         titles.add("打单状态");
+        titles.add("通知配货日期");
         titles.add("打单日期");
         titles.add("是否出库");
         titles.add("出库日期");
@@ -971,6 +972,7 @@ public class AwaitSendController {
                     }
                 }
                 row.add(salesShoppingStatus);
+                row.add(salesOrder.getSalesDistributionTime() == null ? null:formatter.format(salesOrder.getSalesDistributionTime()));  //salesDistributionTime
                 row.add(salesOrder.getSalesSendTime() == null ? null:formatter.format(salesOrder.getSalesSendTime()));
 
                 String salesDeliver = "";

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

@@ -563,7 +563,7 @@
                 </div>
             </div>
 
-            <div class="row cl" id="customerCostsDiv" style="display: none;">
+            <div class="row cl" id="customerCostsDiv" style="">
                   <label class="form-label col-1 col-sm-1">工厂报价：</label>
                   <div class="col-2 col-sm-2">
                      <input type="text" class="input-text trim_input" placeholder="工厂报价" id="relationFactoryCosts" name="relationFactoryCosts" value="">

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/deliver_statistics.ftl

@@ -53,8 +53,6 @@
     <div class="pd-20 cl">
         <form action="" method="post" class="form form-horizontal" id="form-order-add"  >
 
-
-
             <div class="row cl">
                 <label class="form-label col-3">
                     <div class="tit-2">今日/昨日产品发货出库统计</div>
@@ -63,7 +61,6 @@
                 </div>
             </div>
 
-
             <div class="mt-20" style="">
                 <table class="table table-border table-bg table-bordered">
                     <tbody id="allDay">

watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/order_statistics.ftl

@@ -9,7 +9,7 @@
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
 <#include "/base/list_base.ftl">
-    <title>订单列表</title>
+    <title>订单统计</title>
     <style>
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
@@ -22,7 +22,7 @@
 <body>
 <nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
     <span class="c-gray en">&gt;</span> 订单管理
-    <span class="c-gray en">&gt;</span> 订单列表
+    <span class="c-gray en">&gt;</span> 订单统计
     <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>
 </nav>
 

watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/post_statistics.ftl

@@ -9,7 +9,7 @@
     <link rel="Bookmark" href="/favicon.ico" >
     <link rel="Shortcut Icon" href="/favicon.ico" />
 <#include "/base/add_base.ftl">
-    <title>快递统计列表</title>
+    <title>快递统计</title>
     <style>
         html{-webkit-text-size-adjust:none;}
         *{padding: 0;margin: 0;}