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

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

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

@@ -152,6 +152,9 @@ public class SalesOrder implements Serializable {
     private Integer sendTheGoods;//待发货数量
     private Integer playSingle;//待打单数量
     private Integer outbound;//待出库数量
+    private Integer takeToBe;//待揽件数量
+    private Integer tookTimeout;//揽件超时数量
+    private Integer tookAbnormal;//揽件异常数量
     private String salesPostFirmName;//快递公司名称
 
     private Integer dealerId;//客户id
@@ -178,6 +181,9 @@ public class SalesOrder implements Serializable {
     private Date orderCaseDate;//揽件时间
     private Integer orderHasCaseDate;//是否已经有揽件时间  1：有  2：没有
 
+
+    private Integer statisticalType;//导航栏搜索条件 1待确认 2待分配物流 3待发货 4待打单 5待出库 6待揽件 7揽件超时
+
     public Integer getSalesOldOrderStatus() {
         return salesOldOrderStatus;
     }
@@ -905,6 +911,30 @@ public class SalesOrder implements Serializable {
         this.outbound = outbound;
     }
 
+    public Integer getTakeToBe() {
+        return takeToBe;
+    }
+
+    public void setTakeToBe(Integer takeToBe) {
+        this.takeToBe = takeToBe;
+    }
+
+    public Integer getTookTimeout() {
+        return tookTimeout;
+    }
+
+    public void setTookTimeout(Integer tookTimeout) {
+        this.tookTimeout = tookTimeout;
+    }
+
+    public Integer getTookAbnormal() {
+        return tookAbnormal;
+    }
+
+    public void setTookAbnormal(Integer tookAbnormal) {
+        this.tookAbnormal = tookAbnormal;
+    }
+
     public List<ComplaintDetectInfo> getComplaintDetectInfoList() {
         return complaintDetectInfoList;
     }
@@ -1048,4 +1078,12 @@ public class SalesOrder implements Serializable {
     public void setOrderHasCaseDate(Integer orderHasCaseDate) {
         this.orderHasCaseDate = orderHasCaseDate;
     }
+
+    public Integer getStatisticalType() {
+        return statisticalType;
+    }
+
+    public void setStatisticalType(Integer statisticalType) {
+        this.statisticalType = statisticalType;
+    }
 }

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

@@ -179,6 +179,30 @@
                 <if test="orderHasCaseDate != null  and orderHasCaseDate == 2">
                     AND order_case_date is null
                 </if>
+                <if test="statisticalType != null  and statisticalType == 1">
+                    AND sales_status != 3 and sales_status = 0
+                </if>
+                <if test="statisticalType != null  and statisticalType == 2">
+                    AND sales_status != 3 and sales_post_firm IS NULL AND sales_status = 1
+                </if>
+                <if test="statisticalType != null  and statisticalType == 3">
+                    AND sales_status != 3 and sales_shipping_status = 0 AND sales_status = 1 AND sales_post_firm IS NOT NULL
+                </if>
+                <if test="statisticalType != null  and statisticalType == 4">
+                    AND sales_status != 3 and sales_shipping_status = 11 AND sales_status = 1 AND sales_post_firm IS NOT NULL
+                </if>
+                <if test="statisticalType != null  and statisticalType == 5">
+                    AND sales_status != 3 and sales_deliver = 1 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL
+                </if>
+                <if test="statisticalType != null  and statisticalType == 6">
+                    AND sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL
+                </if>
+                <if test="statisticalType != null  and statisticalType == 7">
+                    AND sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &gt;= 3 AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &lt;= 24
+                </if>
+                <if test="statisticalType != null  and statisticalType == 8">
+                    AND sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &gt;= 24
+                </if>
             </where>
             GROUP BY
             soi.sales_id
@@ -419,7 +443,7 @@
     </select>
 
     <!-- 订单数量 -->
-    <select id="listSalesOrderNum" resultType="Integer" parameterType="SalesOrder" >
+    <!--<select id="listSalesOrderNum" resultType="Integer" parameterType="SalesOrder" >
         select
           count(tb_rst_sales_order_info.sales_id)
         from tb_rst_sales_order_info
@@ -523,6 +547,153 @@
                 AND order_case_date is null
             </if>
         </where>
+    </select>-->
+    <select id="listSalesOrderNum" resultType="Integer" parameterType="SalesOrder" >
+        SELECT
+        COUNT(1)
+        FROM
+        (
+        SELECT
+        soi.*
+        FROM tb_rst_sales_order_info soi
+        LEFT JOIN tb_rst_sales_order_item oi ON soi.sales_id = oi.item_order_id
+        LEFT JOIN tb_rst_cm_relation cr ON soi.sales_customer_id = cr.customer_id
+        LEFT JOIN tb_rst_cm_proc_method pm ON pm.proc_method_id = cr.proc_method_id
+        LEFT JOIN tb_rst_cm_proc_type pt ON pt.proc_type_id = pm.proc_type_id
+        <where>
+            <if test="isSelectCustomer !=null and isSelectCustomer !='' and isSelectCustomer == 2 ">
+                soi.sales_batch_id != 'KS00000000000001'
+            </if>
+            <if test="salesIsDownload !=null and salesIsDownload !=''">
+                AND sales_is_download = #{salesIsDownload}
+            </if>
+            <if test="salesShippingStatus !=null">
+                AND sales_shipping_status = #{salesShippingStatus}
+            </if>
+            <if test="salesStatus !=null">
+                AND sales_status = #{salesStatus}
+            </if>
+            <if test="salesOrderStatus !=null">
+                AND sales_order_status = #{salesOrderStatus}
+            </if>
+            <if test="salesDeliver !=null">
+                AND sales_deliver = #{salesDeliver}
+            </if>
+            <if test="salesStoreId !=null and salesStoreId !=''">
+                AND sales_store_id = #{salesStoreId}
+            </if>
+            <if test="salesPostFirm !=null and salesPostFirm !=''">
+                AND sales_post_firm = #{salesPostFirm}
+            </if>
+            <if test="salesPostNum !=null and salesPostNum !=''">
+                AND sales_post_num like CONCAT('%',#{salesPostNum},'%')
+            </if>
+            <if test="salesCompanyId !=null and salesCompanyId !=''">
+                AND sales_company_id = #{salesCompanyId}
+            </if>
+            <if test="salesId !=null">
+                AND sales_id = #{salesId}
+            </if>
+            <if test="salesOrderId !=null and salesOrderId !=''">
+                AND sales_orderId = #{salesOrderId}
+            </if>
+            <if test="salesDealCode !=null and salesDealCode !=''">
+                AND sales_deal_code = #{salesDealCode}
+            </if>
+            <if test="salesAddressTel !=null and salesAddressTel !=''">
+                AND sales_address_tel like CONCAT('%',#{salesAddressTel},'%')
+            </if>
+            <if test="salesAddressName !=null and salesAddressName !=''">
+                AND sales_address_name like CONCAT('%',#{salesAddressName},'%')
+            </if>
+            <if test="salesBatchId !=null and salesBatchId !=''">
+                AND sales_batch_id = #{salesBatchId}
+            </if>
+            <if test="salesAddressInfo !=null and salesAddressInfo !=''">
+                AND sales_address_info like CONCAT('%',#{salesAddressInfo},'%')
+            </if>
+            <if test="startDate != null and startDate != ''">
+                AND sales_create_time <![CDATA[>=]]> #{startDate}
+            </if>
+            <if test="endDate != null and endDate != ''">
+                AND sales_create_time <![CDATA[<=]]> #{endDate}
+            </if>
+            <if test="salesAdminId != null ">
+                AND sales_admin_id = #{salesAdminId}
+            </if>
+            <if test="salesAddType != null ">
+                AND sales_add_type = #{salesAddType}
+            </if>
+            <if test="itemProductName !=null and itemProductName !=''">
+                AND (oi.item_product_color like CONCAT('%',#{itemProductName},'%') OR oi.item_product_name LIKE CONCAT('%',#{itemProductName},'%'))
+            </if>
+            <if test="colorId !=null and colorId !=''">
+                AND oi.item_color_id = #{colorId}
+            </if>
+            <if test="salesIds != null and salesIds != ''">
+                AND sales_id IN
+                <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
+                    #{node}
+                </foreach >
+                or sales_belong_orderId IN
+                <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
+                    #{node}
+                </foreach >
+            </if>
+            <if test="salesWarehouseId != null ">
+                AND sales_warehouse_id = #{salesWarehouseId}
+            </if>
+            <if test="salesIsSublist != null  and salesIsSublist !=''">
+                AND sales_is_sublist = #{salesIsSublist}
+            </if>
+            <if test="procTypeId != null  and procTypeId !=''">
+                AND pt.proc_type_id = #{procTypeId}
+            </if>
+            <if test="orderHasCaseDate != null  and orderHasCaseDate == 1">
+                AND order_case_date is not null
+            </if>
+            <if test="orderHasCaseDate != null  and orderHasCaseDate == 2">
+                AND order_case_date is null
+            </if>
+            <if test="statisticalType != null  and statisticalType == 1">
+                AND sales_status != 3 and sales_status = 0
+            </if>
+            <if test="statisticalType != null  and statisticalType == 2">
+                AND sales_status != 3 and sales_post_firm IS NULL AND sales_status = 1
+            </if>
+            <if test="statisticalType != null  and statisticalType == 3">
+                AND sales_status != 3 and sales_shipping_status = 0 AND sales_status = 1 AND sales_post_firm IS NOT NULL
+            </if>
+            <if test="statisticalType != null  and statisticalType == 4">
+                AND sales_status != 3 and sales_shipping_status = 11 AND sales_status = 1 AND sales_post_firm IS NOT NULL
+            </if>
+            <if test="statisticalType != null  and statisticalType == 5">
+                AND sales_status != 3 and sales_deliver = 1 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL
+            </if>
+            <if test="statisticalType != null  and statisticalType == 6">
+                AND sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL
+            </if>
+            <if test="statisticalType != null  and statisticalType == 7">
+                AND sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &gt;= 3 AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &lt;= 24
+            </if>
+            <if test="statisticalType != null  and statisticalType == 8">
+                AND sales_status != 3 and sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &gt;= 24
+            </if>
+        </where>
+        GROUP BY
+        soi.sales_id
+        ORDER BY
+        soi.sales_create_time DESC
+        ) temp
+        LEFT JOIN tb_rst_sales_company trsc ON temp.sales_company_id = trsc.company_id
+        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_cm_relation cr ON temp.sales_customer_id = cr.customer_id
+        LEFT JOIN tb_rst_cm_proc_method pm ON pm.proc_method_id = cr.proc_method_id
+        LEFT JOIN tb_rst_cm_proc_type pt ON pt.proc_type_id = pm.proc_type_id
+        LEFT JOIN tb_rst_sys_admin ao ON temp.sales_admin_id = ao.admin_id
+        ORDER BY
+        temp.sales_create_time DESC
     </select>
 
     <!-- 订单项集合 -->
@@ -1931,15 +2102,18 @@
     </select>
     <select id="getStatusNum" resultType="SalesOrder">
         SELECT
-            sum(CASE WHEN sales_status = 0 then 1 else 0 end) AS beConfirmedNum,
-            sum(CASE WHEN sales_post_firm IS NULL then 1 else 0 end) AS distributionLogisticsNum,
-            sum(CASE WHEN sales_shipping_status = 0 then 1 else 0 end) AS sendTheGoods,
-            sum(CASE WHEN sales_shipping_status = 11 then 1 else 0 end) AS playSingle,
-            sum(CASE WHEN sales_deliver = 1 then 1 else 0 end) AS outbound
+        sum(CASE WHEN sales_status = 0 then 1 else 0 end) AS beConfirmedNum,
+        sum(CASE WHEN (sales_post_firm IS NULL AND sales_status = 1) then 1 else 0 end) AS distributionLogisticsNum,
+        sum(CASE WHEN (sales_shipping_status = 0 AND sales_status = 1 AND sales_post_firm IS NOT NULL) then 1 else 0 end) AS sendTheGoods,
+        sum(CASE WHEN (sales_shipping_status = 11 AND sales_status = 1 AND sales_post_firm IS NOT NULL) then 1 else 0 end) AS playSingle,
+        sum(CASE WHEN (sales_deliver = 1 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL) then 1 else 0 end) AS outbound,
+        sum(CASE WHEN (sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL) then 1 else 0 end) AS takeToBe,
+        sum(CASE WHEN (sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &gt;= 3 AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &lt;= 24) then 1 else 0 end) AS tookTimeout,
+        sum(CASE WHEN (sales_deliver = 2 AND sales_shipping_status = 1 AND sales_status = 1 AND sales_post_firm IS NOT NULL AND order_case_date IS NULL AND TIMESTAMPDIFF(HOUR,sales_deliver_time,NOW()) &gt;= 24) then 1 else 0 end) AS tookAbnormal
         FROM
-            tb_rst_sales_order_info
+        tb_rst_sales_order_info
         WHERE
-            sales_status != 3
+        sales_status != 3
         AND sales_batch_id != 'KS00000000000001'
     </select>
 

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

@@ -467,7 +467,7 @@
                         <#list listPostageInfo as postageInfo>
                         <tr id="deleteId${(postageInfo.postageId)!''}">
                             <td>${(postageInfo.postageId)!''}</td>
-                            <td>${(postageInfo.postageAmount)!''}</td>
+                            <td>${(postageInfo.postageAmount/100)!''}</td>
                             <td>${(postageInfo.postageAlipayName)!''}</td>
                             <td>${(postageInfo.postageAlipay)!''}</td>
                             <td>
@@ -654,13 +654,13 @@
                 </div>
             </div>
              </div>
-                 <div class="row cl">
+                 <#--<div class="row cl">
                      <div class="formControls col-2 col-sm-2">
                      </div>
                      <div class="formControls col-8 col-sm-8 text-c">
                          <button onClick="update_relation_info(2);" class="btn btn-primary" type="button">确认修改</button>
                      </div>
-                 </div>
+                 </div>-->
              </div>
         </div>