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

# Conflicts:
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintSmallClassInfoService.java
#	watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintTypeInfoService.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintSmallClassInfoServiceImpl.java
#	watero-rst-service/src/main/java/com/iamberry/rst/service/cm/ComplaintTypeInfoServiceImpl.java

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/CompanyInfoService.java

@@ -0,0 +1,17 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.CompanyInfo;
+
+import java.util.List;
+
+/**
+ * 销售公司
+ */
+public interface CompanyInfoService {
+
+    /**
+     * 查询销售公司集合
+     */
+    List<CompanyInfo> listCompanyInfo(CompanyInfo companyInfo);
+
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -36,4 +36,11 @@ public interface SalesOrderService {
      * @return
      */
     Integer addSalesOrderList(List<SalesOrder> list);
+
+    /**
+     * 获取订单集合
+     * @param salesOrder
+     * @return
+     */
+    List<SalesOrder> listSalesOrder (SalesOrder salesOrder);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CompanyInfoServiceImpl.java

@@ -0,0 +1,24 @@
+package com.iamberry.rst.service.cm;
+
+import com.iamberry.rst.core.cm.CompanyInfo;
+import com.iamberry.rst.faces.cm.CompanyInfoService;
+import com.iamberry.rst.service.cm.mapper.CompanyInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 销售公司
+ */
+@Service
+public class CompanyInfoServiceImpl implements CompanyInfoService{
+
+    @Autowired
+    private CompanyInfoMapper companyInfoMapper;
+
+    @Override
+    public List<CompanyInfo> listCompanyInfo(CompanyInfo companyInfo) {
+        return companyInfoMapper.listCompanyInfo(companyInfo);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -36,4 +36,9 @@ public class SalesOrderServiceImpl implements SalesOrderService {
     public Integer addSalesOrderList(List<SalesOrder> list) {
         return salesOrderMapper.addSalesOrderList(list);
     }
+
+    @Override
+    public List<SalesOrder> listSalesOrder(SalesOrder salesOrder) {
+        return salesOrderMapper.listSalesOrder(salesOrder);
+    }
 }

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

@@ -2,6 +2,8 @@ package com.iamberry.rst.service.cm.mapper;
 
 import com.iamberry.rst.core.cm.CompanyInfo;
 
+import java.util.List;
+
 public interface CompanyInfoMapper {
 
     /**
@@ -24,4 +26,9 @@ public interface CompanyInfoMapper {
      * @return
      */
     Integer updateCompanyInfo(CompanyInfo companyInfo);
+
+    /**
+     * 查询销售公司集合
+     */
+    List<CompanyInfo> listCompanyInfo(CompanyInfo companyInfo);
 }

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

@@ -33,4 +33,11 @@ public interface SalesOrderMapper {
      * @return
      */
     Integer addSalesOrderList(List<SalesOrder> list);
+
+    /**
+     * 获取订单集合
+     * @param salesOrder
+     * @return
+     */
+    List<SalesOrder> listSalesOrder (SalesOrder salesOrder);
 }

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

@@ -23,6 +23,15 @@
     where company_id = #{companyId,jdbcType=INTEGER}
   </select>
 
+  <select id="listCompanyInfo" resultType="CompanyInfo" parameterType="CompanyInfo" >
+    select
+    <include refid="companyInfo" />
+    from tb_rst_sales_company
+    where
+      company_status = 1
+  </select>
+
+
   <!-- 添加销售公司信息 -->
   <insert id="addCompanyInfo" parameterType="CompanyInfo" useGeneratedKeys="true" keyProperty="companyId">
     insert into tb_rst_sales_company (company_id, company_name, company_abbreviation, 

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

@@ -49,6 +49,36 @@
     where sales_id = #{salesId,jdbcType=INTEGER}
   </select>
 
+  <!-- 订单集合 -->
+  <select id="listSalesOrder" resultType="SalesOrder" parameterType="SalesOrder" >
+    select
+    <include refid="salesOrderInfo" />
+    from tb_rst_sales_order_info
+    <where>
+      <if test="salesStatus !=null and salesStatus !=''">
+        AND sales_status = #{salesStatus}
+      </if>
+      <if test="salesStoreId !=null and salesStoreId !=''">
+        AND sales_store_id = #{salesStoreId}
+      </if>
+      <if test="salesCompanyId !=null and salesCompanyId !=''">
+        AND sales_company_id = #{salesCompanyId}
+      </if>
+      <if test="salesId !=null">
+        AND sales_id like CONCAT('%',#{salesId},'%')
+      </if>
+      <if test="salesOrderId !=null and salesOrderId !=''">
+        AND sales_orderId like CONCAT('%',#{salesOrderId},'%')
+      </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>
+    </where>
+  </select>
+
   <!-- 添加订单信息 -->
   <insert id="addSalesOrder" parameterType="SalesOrder" keyProperty="salesId" useGeneratedKeys="true" >
     insert into tb_rst_sales_order_info (sales_id, sales_orderId, sales_openId, 

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

@@ -33,7 +33,10 @@
         store_efast = #{storeEfast}
       </if>
       <if test="storeStatus != null">
-        and storeStatus = #{storeStatus}
+        and store_status = #{storeStatus}
+      </if>
+      <if test="companyId != null">
+        and company_id = #{companyId}
       </if>
     </where>
   </select>

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

@@ -1,13 +1,20 @@
 package com.iamberry.rst.controllers.cm;
 
-import com.iamberry.rst.core.cm.CustomerInfo;
+import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.faces.cm.CompanyInfoService;
+import com.iamberry.rst.faces.cm.SalesOrderService;
+import com.iamberry.rst.faces.cm.StoreInfoService;
+import com.iamberry.wechat.tools.ResponseJson;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * Created by wxm
@@ -16,7 +23,14 @@ import javax.servlet.http.HttpServletRequest;
 @RequestMapping("/admin/customer")
 public class AdminCustomerController {
 
+    @Autowired
+    private CompanyInfoService companyInfoService;
 
+    @Autowired
+    private StoreInfoService storeInfoService;
+
+    @Autowired
+    private SalesOrderService salesOrderService;
 
     /**
      * 获取客诉列表
@@ -61,7 +75,7 @@ public class AdminCustomerController {
     }
 
     /**
-     * 客诉搜索订单列表
+     * 搜索订单列表弹出框
      *
      * @return
      */
@@ -70,11 +84,58 @@ public class AdminCustomerController {
     public ModelAndView selectOrder(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("cm/customer/order_list");
 
+        //获取销售公司
+        List<CompanyInfo> companyInfoList =  companyInfoService.listCompanyInfo(new CompanyInfo());
 
+        mv.addObject("companyInfoList", companyInfoList);
         return mv;
     }
 
 
+    /**
+     * 获取店铺集合
+     * @param request
+     * @param storeInfo
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("customer:add:customer")
+    @RequestMapping(value = "/select_storeInfo")
+    public ResponseJson listStoreInfo(HttpServletRequest request,StoreInfo storeInfo) {
+        storeInfo.setStoreStatus(1);
+        List<StoreInfo> storeInfoList = storeInfoService.listStore(storeInfo);
+
+        if (storeInfoList == null || storeInfoList.size() < 1) {
+            return new ResponseJson(500, "查询失败", 500);
+        } else {
+            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+            rj.addResponseKeyValue("storeInfoList", storeInfoList);
+            return rj;
+        }
+    }
+
+    /**
+     * 获取订单集合
+     * @param request
+     * @param salesOrder
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("customer:add:customer")
+    @RequestMapping(value = "/select_salesOrder")
+    public ResponseJson listOrder(HttpServletRequest request,SalesOrder salesOrder) {
+        List<SalesOrder> salesOrderList = salesOrderService.listSalesOrder(salesOrder);
+
+
+
+        if (salesOrderList == null || salesOrderList.size() < 1) {
+            return new ResponseJson(500, "查询失败", 500);
+        } else {
+            ResponseJson rj =new ResponseJson(200, "查询成功", 200);
+            rj.addResponseKeyValue("salesOrderList", salesOrderList);
+            return rj;
+        }
+    }
 
 }
 

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

@@ -23,62 +23,73 @@
     </style>
 </head>
 <body>
-<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
-    <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>
 <div class="page-container">
     <div class="text-c">
         <form action="${path}/admin/customer/_customer_list" method="post">
             <div class="row cl">
                 <div class="formControls col-4 col-sm-4" style="width: 150px;"> <span class="select-box">
-                    <select name="" class="select">
-                        <option value="0">薇薇</option>
-                        <option value="1">薇薇</option>
-                        <option value="11">薇薇</option>
-                        <option value="12">薇薇</option>
-                        <option value="13">薇薇</option>
+                    <select name="" class="select" id="companyId">
+                        <#if companyInfoList?? &&  (companyInfoList?size > 0) >
+                            <#list companyInfoList as companyInfo>
+                                <option value ="${companyInfo.companyId!""}">${companyInfo.companyName!""}</option>
+                            </#list>
+                        </#if>
                     </select>
                     </span>
                 </div>
                 <div class="formControls col-4 col-sm-4" style="width: 150px;"> <span class="select-box">
-                    <select name="" class="select">
-                        <option value="0">薇薇</option>
-                        <option value="1">薇薇</option>
-                        <option value="11">薇薇</option>
-                        <option value="12">薇薇</option>
-                        <option value="13">薇薇</option>
+                    <select name="" class="select" id="storeId">
                     </select>
                     </span>
                 </div>
+                <div class="formControls col-4 col-sm-4" style="width: 150px;"> <span class="select-box">
+                    <select name="" class="select" id="storeId">
+                        <option value="1">取消订单</option>
+                        <option value="2">待支付</option>
+                        <#--<option value="3"></option>
+                        <option value="4"></option>
+                        <option value="5"></option>
+                        <option value="6"></option>
+                        <option value="7"></option>
+                        <option value="8"></option>
+                        <option value="9"></option>
+                        <option value="10"></option>
+                        <option value="11"></option>
+                        <option value="12"></option>-->
+                    </select>
+                    </span>
+                </div>
+                <div class="formControls col-2 col-sm-2">
+                    <input type="text" class="input-text" value="" placeholder="订单编号" id="salesId" name="">
+                </div>
+                <div class="formControls col-2 col-sm-2">
+                    <input type="text" class="input-text" value="" placeholder="收货人姓名" id="salesAddressName" name="">
+                </div>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" class="input-text" value="" placeholder="请输入手机号" id="" name="">
+                    <input type="text" class="input-text" value="" placeholder="收货人电话" id="salesAddressTel" name="">
                 </div>
-                <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
+                <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);" id="searchOrder" name=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
             </div>
         </form>
     </div>
 
-    <#--<div class="mt-20">
+    <div class="mt-20">
         <table class="table table-border table-bordered table-bg table-hover table-sort">
         <thead>
         <tr class="text-c">
-            &lt;#&ndash;<th width="50">Customer编号</th>&ndash;&gt;
-            <th width="60">所属产品</th>
-            <th width="100">customer名称</th>
-            <th width="80">硬件版本</th>
-            <th width="80">零件总数量</th>
-            <th width="80">零件总成本(元)</th>
-            <th width="80">零件总重(g)</th>
-            <th width="100">备注</th>
-            <th width="80">最近修改时间</th>
-            <th width="80">添加时间</th>
+            <th width="50">渠道商</th>
+            <th width="60">订单编号</th>
+            <th width="100">收货人姓名</th>
+            <th width="80">收货人电话</th>
+            <th width="80">订单金额</th>
+            <th width="80">购买产品</th>
+            <th width="80">购买日期</th>
+            <th width="100">收货地址</th>
             <th width="80">操作</th>
         </tr>
         </thead>
-        <tbody>
-            <#if page.dataList?? &&  (page.dataList?size > 0) >
+        <tbody id="orderAll">
+            <#--<#if page.dataList?? &&  (page.dataList?size > 0) >
                     <#list page.dataList as customer>
                         <tr class="text-c">
                             &lt;#&ndash;<td>${customer.customerId!''}</td>&ndash;&gt;
@@ -91,32 +102,105 @@
                             <td>${customer.customerRemarks!''}</td>
                             <td>${(customer.customerUpdateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
                             <td>${(customer.customerCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</td>
-                            <td>
-                                <a style="text-decoration:none" href="javascript:void(0);" title="编辑" onclick="admin_update_customer(${customer.customerId!''})">
-                                    <i class="Hui-iconfont">&#xe6df;</i>
-                                </a>&nbsp;
-                                <a style="text-decoration:none" href="javascript:void(0);" title="查看customer单详情" onclick="admin_details_customer(${customer.customerId!''})">
-                                    <i class="Hui-iconfont">&#xe665;</i>
-                                </a>
-                            </td>
                         </tr>
                     </#list>
             <#else>
                 <tr><td colspan="10" class="td-manage text-c" >暂时没有Customer，请添加！</td></tr>
-            </#if>
+            </#if>-->
         </tbody>
     </table>
-    </div>-->
+    </div>
 </div>
 <tfoot>
 <#--<#include "/base/page_util.ftl">-->
 </tfoot>
 <script>
+
+    $(function () {
+        /*选择店铺*/
+        selectStoreInfo();
+
+        /*搜索*/
+        $(document).on('click', '#searchOrder', function() {
+            searchOrder();
+        });
+    })
+
+    /*获取销售公司下的所有店铺*/
+    function selectStoreInfo() {
+        var companyId = $("#companyId").val();
+        var html = "";
+        $.ajax({
+            type: "POST",
+            data: {
+                companyId : companyId
+            },
+            url: "${path}/admin/customer/select_storeInfo",
+            async: false,
+            success: function(data){
+                var id;
+                if (data.returnCode == 200) {
+                    for(var i=0;i<data.returnMsg.storeInfoList.length;i++){
+                        var storeInfo = data.returnMsg.storeInfoList[i];
+                        html += '<option value="'+ storeInfo.storeId +'">'+ storeInfo.storeName +'</option>';
+                    }
+                }else{
+                    html = '';
+                }
+                $("#storeId").html(html);
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
+    }
+
     /**
-     * 跳转到添加customer页面
+     * 搜索订单
      */
-    function toAddCustomer(){
-        window.location.href= "${path}/admin/customer/to_add_customer";
+    function searchOrder(){
+        var salesCompanyId = $("#companyId").val();
+        var salesStoreId = $("#storeId").val();
+        var salesStatus = $("#salesStatus").val();
+        var salesId = $("#salesId").val();
+        var salesAddressName = $("#salesAddressName").val();
+        var salesAddressTel = $("#salesAddressTel").val();
+        var html = "";
+        $.ajax({
+            type: "POST",
+            data: {
+                salesCompanyId : salesCompanyId,
+                salesStoreId : salesStoreId,
+                salesStatus : salesStatus,
+                salesId : salesId,
+                salesAddressName : salesAddressName,
+                salesAddressTel : salesAddressTel
+            },
+            url: "${path}/admin/customer/select_salesOrder",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    for(var i=0;i<data.returnMsg.salesOrderList.length;i++){
+                        var salesOrder = data.returnMsg.salesOrderList[i];
+                        html += '<tr class="text-c">' +
+                                ' <td></td>' +
+                                ' <td></td>' +
+                                ' <td></td>' +
+                                ' <td></td>' +
+                                ' <td></td>' +
+                                ' <td></td>' +
+                                ' <td></td>' +
+                                ' <td></td>' +
+                                ' <td></td>' +
+                                ' </tr>';
+                    }
+                }else{
+                    html = '';
+                }
+                $("#orderAll").html(html);
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        });
     }
 
     /**