Merge branch 'master' into develop

# Conflicts:
#	watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

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

@@ -35,6 +35,11 @@ public class PostageInfo implements Serializable{
     //客户id
     private Integer dealerId;
 
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
+    private Date customerCreateTime;           //创建时间
+
+
     public Integer getPostageId() {
         return postageId;
     }
@@ -154,4 +159,12 @@ public class PostageInfo implements Serializable{
     public void setDealerId(Integer dealerId) {
         this.dealerId = dealerId;
     }
+
+    public Date getCustomerCreateTime() {
+        return customerCreateTime;
+    }
+
+    public void setCustomerCreateTime(Date customerCreateTime) {
+        this.customerCreateTime = customerCreateTime;
+    }
 }

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

@@ -152,6 +152,8 @@ public class SalesOrder implements Serializable {
     private Integer outbound;//待出库数量
     private String salesPostFirmName;//快递公司名称
 
+    private Integer dealerId;//待打单数量
+
     private List<ComplaintDetectInfo> complaintDetectInfoList;
     public Integer getSalesOldOrderStatus() {
         return salesOldOrderStatus;
@@ -903,4 +905,12 @@ public class SalesOrder implements Serializable {
     public void setSalesAddressPostcode(String salesAddressPostcode) {
         this.salesAddressPostcode = salesAddressPostcode;
     }
+
+    public Integer getDealerId() {
+        return dealerId;
+    }
+
+    public void setDealerId(Integer dealerId) {
+        this.dealerId = dealerId;
+    }
 }

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

@@ -1576,6 +1576,17 @@
                     AND sales_distribution_time <![CDATA[<=]]> #{endDate}
                 </if>
             </if>
+            <if test="dealerId != null">
+                AND  sales_store_id IN (
+                    select
+                    distinct t.store_id
+                    from
+                    tb_rst_store_info t
+                    LEFT JOIN tb_rst_dm_dealer_channel_store dcs ON t.store_id = dcs.store_id
+                    LEFT JOIN tb_rst_dm_dealer_channel dc ON dcs.deal_channel_id = dc.deal_channel_id
+                    WHERE dc.dealer_id = #{dealerId}
+                )
+            </if>
         </where>
         GROUP BY tb_rst_sales_order_info.sales_id
         ORDER BY tb_rst_sales_order_info.sales_id DESC

watero-rst-service/src/main/java/com/iamberry/rst/service/dm/mapper/financialReceiptMapper.xml

@@ -150,7 +150,8 @@
     <select id="getPostageInfoList" resultType="PostageInfo" parameterType="PostageInfo" >
         SELECT
           rpi.*,
-          cci.customer_id
+          cci.customer_id,
+          cci.customer_create_time
         FROM tb_rst_postage_info rpi
         LEFT JOIN tb_rst_cm_relation rcr ON rpi.relation_id = rcr.relation_id
         LEFT JOIN tb_rst_cm_customer_info cci ON rcr.customer_id = cci.customer_id

watero-rst-web/src/main/java/com/iamberry/rst/controllers/dm/FinanciaReceController.java

@@ -1,6 +1,5 @@
 package com.iamberry.rst.controllers.dm;
 
-import com.iamberry.rst.core.cm.CompanyInfo;
 import com.iamberry.rst.core.cm.PostageInfo;
 import com.iamberry.rst.core.cm.SalesOrder;
 import com.iamberry.rst.core.cm.StoreInfo;
@@ -435,8 +434,14 @@ public class FinanciaReceController {
         }
 
         //获取销售公司
-        List<CompanyInfo> companyInfoList = companyInfoService.listCompanyInfo(new CompanyInfo());
-        mv.addObject("companyInfoList", companyInfoList);
+//        List<CompanyInfo> companyInfoList = companyInfoService.listCompanyInfo(new CompanyInfo());
+//        mv.addObject("companyInfoList", companyInfoList);
+
+        DmDealer dmDealer = new DmDealer();
+        dmDealer.setDealerStatus(1);
+        List<DmDealer>  dmDealerList = dmDealerService.getDmDealerList(dmDealer);
+        mv.addObject("dmDealerList", dmDealerList);
+
         mv.addObject("salesOrder", salesOrder);
         return mv;
     }

watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/select_order_list.ftl

@@ -63,17 +63,14 @@
             <form action="" method="post">
                 <div class="row cl" style="margin-left: 0px;">
 
-                 <#--   <div class="formControls col-1 col-sm-1" style="margin-right: 30px;">
-                        <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="" name="" onclick="addOrder()">添加订单</button>
-                    </div>-->
                     <div class="formControls col-2 col-sm-2" style="padding: 0px 10px 0px 0px; width: 110px;" > <span class="select-box">
-                        <select name="companyId" class="select" id="companyId">
-                             <option value="">销售公司</option>
-                            <#if companyInfoList?? &&  (companyInfoList?size > 0) >
-                                <#list companyInfoList as companyInfo>
-                                    <option value ="${companyInfo.companyId!""}">${companyInfo.companyName!""}</option>
-                                </#list>
-                            </#if>
+                        <select name="dealerId" class="select" id="dealerId">
+                             <option value="">选择客户</option>
+                        <#if dmDealerList?? &&  (dmDealerList?size > 0) >
+                            <#list dmDealerList as dmDealer>
+                                <option value ="${dmDealer.dealerId!""}">${dmDealer.dealerName!""}</option>
+                            </#list>
+                        </#if>
                         </select>
                         </span>
                     </div>
@@ -165,9 +162,9 @@
 
     $(function () {
         /*选择店铺*/
-        $("[name='companyId']").change(function (){
-            var companyId = $(this).val();
-            setStore(companyId,$("#storeId"));       //获取店铺
+        $("[name='dealerId']").change(function (){
+            var dealerId = $(this).val();
+            setStore(dealerId,$("#storeId"));       //获取店铺
         });
 
         /*搜索*/
@@ -191,7 +188,7 @@
             shade: [0.5,'#fff'] //0.1透明度的白色背景
         });
 
-        var salesCompanyId = cufte($("#companyId").val());
+        var dealerId = cufte($("#dealerId").val());
         var salesStoreId = cufte($("#storeId").val());
         var salesOrderStatus = cufte($("#salesOrderStatus").val());
         var salesStatus = cufte($("#salesStatus").val());
@@ -204,7 +201,7 @@
         $.ajax({
             type: "POST",
             data: {
-                salesCompanyId : salesCompanyId,
+                dealerId : dealerId,
                 salesStoreId : salesStoreId,
                 salesOrderStatus : salesOrderStatus,
                 salesStatus : salesStatus,
@@ -291,18 +288,16 @@
 
 
 <script>
-    /**
-     * 展示销售公司
-     */
-    function setStore(companyId,node){
-        var companyId = $("#companyId").val();
+    //展示销售公司
+    function setStore(dealerId,node){
+        var dealerId = cufte($("#dealerId option:checked").val());
         var html = '<option value="">店铺</option>';
         $.ajax({
             type: "POST",
             data: {
-                companyId : companyId
+                dealerId : dealerId
             },
-            url: "${path}/admin/salesChannel/select_storeInfo",
+            url: "${path}/admin/financial_receipt/select_storeInfo_by_dealer",
             success: function(data){
                 var id;
                 if (data.returnCode == 200) {
@@ -319,9 +314,6 @@
             }
         });
     }
-
-
-
 </script>
 </body>
 </html>

watero-rst-web/src/main/webapp/WEB-INF/views/dm/financialReceipt/select_post_list.ftl

@@ -148,7 +148,7 @@
                     <th width="100">转账类型</th>
                     <th width="60">状态</th>
                     <th width="80">备注</th>
-                    <th width="80">创建时间</th>
+                    <th width="80">客诉创建时间</th>
                 </tr>
                 </thead>
                 <tbody id="orderAll">
@@ -259,7 +259,7 @@
                         }else if(postageInfo.postageStatus == 4){
                             postageStatus = '未知';
                         }
-                        var time = formatDate(new Date(postageInfo.postageCreateTime),"yyyy-MM-dd");
+                        var time = formatDate(new Date(postageInfo.customerCreateTime),"yyyy-MM-dd");
 
                         html += '<tr class="text-c">' +
                                 '<input type="hidden" class="postageAlipayType" value="'+ postageInfo.postageAlipayType +'">' +
@@ -345,9 +345,6 @@
             }
         });
     }
-
-
-
 </script>
 </body>
 </html>