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

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

@@ -165,6 +165,7 @@ public class CustomerInfo  implements Serializable {
     private String customerDistrictId;    //区
     private List<PostageInfo> postageInfoList;    //邮费集合
     private List<SendbackInfo> sendbackInfoList;    //寄回信息集合
+    private List<SalesOrder> salesOrderList;    //寄出产品订单集合
 
     public void setComplaintDetectList(List<ComplaintDetectInfo> complaintDetectList) {
         this.complaintDetectList = complaintDetectList;
@@ -835,4 +836,12 @@ public class CustomerInfo  implements Serializable {
     public void setSendbackInfoList(List<SendbackInfo> sendbackInfoList) {
         this.sendbackInfoList = sendbackInfoList;
     }
+
+    public List<SalesOrder> getSalesOrderList() {
+        return salesOrderList;
+    }
+
+    public void setSalesOrderList(List<SalesOrder> salesOrderList) {
+        this.salesOrderList = salesOrderList;
+    }
 }

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

@@ -56,6 +56,13 @@ public interface CustomerService {
     PagedResult<CustomerInfo> listCustomer(int pageNO, int pageSize, CustomerInfo customerInfo, boolean isTotalNum);
 
     /**
+     * 查询客诉列表
+     * @param customerInfo
+     * @return
+     */
+    List<CustomerInfo> listCustomer(CustomerInfo customerInfo);
+
+    /**
      * 查询客诉基本信息
      * @param customerInfo
      * @return

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

@@ -1060,6 +1060,11 @@ public class CustomerServiceImpl implements CustomerService {
     }
 
     @Override
+    public  List<CustomerInfo> listCustomer(CustomerInfo customerInfo) {
+        return customerInfoMapper.listCustomer(customerInfo);
+    }
+
+    @Override
     public Map<String,Object> getCustomerInfo(CustomerInfo customerInfo) {
         Map<String,Object> map = new HashMap<String,Object>();
         CustomerCommon customerCommon = new CustomerCommon();

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

@@ -475,6 +475,7 @@
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
    <!-- <collection property="postageInfoList" column="customer_id" ofType="PostageInfo" select="listPostageInfoByCustomerId"/>-->
     <collection property="sendbackInfoList" column="customer_id" ofType="SendbackInfo" select="listSendbackInfoByCustomerId"/>
+    <collection property="salesOrderList" column="customer_id" ofType="SalesOrder" select="listSalesOrderListByCustomerId"/>
   </resultMap>
 
   <select id="listComplaintDetect" parameterType="Integer" resultType="ComplaintDetectInfo">
@@ -487,6 +488,26 @@
     ORDER BY detect_id ASC
   </select>
 
+  <select id="listSalesOrderListByCustomerId" parameterType="Integer" resultType="SalesOrder">
+    SELECT
+      sales_id,
+      sales_orderId,
+      sales_post_num,
+      sales_post_firm,
+      sales_order_status,
+      sales_status,
+      sales_shipping_status,
+      sales_deliver,
+      sales_admin_id,
+      sales_customer_id,
+      sales_batch_id,
+      sales_return_status
+    FROM
+      tb_rst_sales_order_info
+    WHERE
+      sales_customer_id = #{customerId}
+  </select>
+
   <insert id="insert" parameterType="CustomerInfo"  useGeneratedKeys="true"  keyProperty="customerId">
     insert into tb_rst_cm_customer_info (customer_id, admin_id, question_id,
       company_id, store_id, customer_source_type, 

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

@@ -1194,6 +1194,9 @@
           <if test="salesId !=null">
               AND t.sales_id = #{salesId}
           </if>
+          <if test="salesCustomerId !=null">
+              AND t.sales_customer_id = #{salesCustomerId}
+          </if>
           <if test="salesOrderId !=null and salesOrderId !=''">
               AND t.sales_orderId = #{salesOrderId}
           </if>
@@ -1410,6 +1413,9 @@
             <if test="salesId !=null">
                 AND sales_id = #{salesId}
             </if>
+            <if test="salesCustomerId !=null">
+                AND sales_customer_id = #{salesCustomerId}
+            </if>
             <if test="salesOrderId !=null and salesOrderId !=''">
                 AND sales_orderId = #{salesOrderId}
             </if>

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

@@ -581,6 +581,31 @@ public class AdminCustomerController {
     }
 
     /**
+     * 查询客诉基本信息
+     *
+     * @param request
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequiresPermissions("customer:select:customer")
+    @RequestMapping("/get_customer")
+    public ResponseJson getCustomer(HttpServletRequest request) throws Exception {
+        String customerId = request.getParameter("customerId");
+        if (!StringUtils.isNotEmpty(customerId)) {
+            return new ResponseJson(500, "该客诉信息不存在!", 500);
+        }
+        SalesOrder salesOrder = new SalesOrder();
+        salesOrder.setSalesCustomerId(Integer.valueOf(customerId));
+        List<SalesOrder> salesOrderList = salesOrderService.salesOrderListAndItem(salesOrder);
+
+        ResponseJson rj = ResponseJson.getSUCCESS();
+        rj.addResponseKeyValue("salesOrderList", salesOrderList);
+        return rj;
+    }
+
+
+    /**
      * 进入添加回访页面
      *
      * @param request
@@ -1298,13 +1323,6 @@ public class AdminCustomerController {
         }
     }
 
-
-
-
-
-
-
-
     /**
      * 查询未解决客诉数量
      */

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

@@ -623,11 +623,12 @@ public class AdminSalesOrderController {
 
     @RequestMapping("/to_add_order")
     @RequiresPermissions("salesOrder:add:manual")
-    public ModelAndView toAddOrder(HttpServletRequest request) throws Exception {
+    public ModelAndView toAddOrder(HttpServletRequest request,SalesOrder salesOrder) throws Exception {
         ModelAndView mv = new ModelAndView("order/salesOrder/add_order");
 
         mv.addObject("admin", AdminUtils.getLoginAdmin());
         mv.addObject("orderBatchs", orderBatchService.getOrderBatchListTwenty());
+        mv.addObject("salesOrder", salesOrder);
         return mv;
     }
 

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

@@ -158,7 +158,7 @@ public class StitchAttrUtil {
      * @return false没有下一页   true 有下一页
      */
     public boolean getLastPage( PagedResult<?> pagedResult){
-        /* 当前页 >= 总页面数目 */
+        // 当前页 >= 总页面数目
         if(pagedResult.getPageNo() >=  pagedResult.getPages()){
             return false;
         }else{

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

@@ -234,18 +234,29 @@
                             <td></td>
                             <td></td>
                             <td>
-                        <#if customer.sendbackInfoList?? &&  (customer.sendbackInfoList?size > 0) >
-                            寄回：
-                            <#list customer.sendbackInfoList as sendbackInfo>
-                                    <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${sendbackInfo.sendbackLogisticsNo!''}&billName=${sendbackInfo.sendbackLogisticsCompany!''}',300,400);">${sendbackInfo.sendbackLogisticsNo!''};</a><br>
-                            </#list>
-                        <#else>
-                        无
-                        </#if>
-                                <#if customer.sendLogisticsNo??>
+                                <#if customer.sendbackInfoList?? &&  (customer.sendbackInfoList?size > 0) >
+                                    寄回：
+                                    <#list customer.sendbackInfoList as sendbackInfo>
+                                            <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${sendbackInfo.sendbackLogisticsNo!''}&billName=${sendbackInfo.sendbackLogisticsCompany!''}',300,400);">${sendbackInfo.sendbackLogisticsNo!''};</a><br>
+                                    </#list>
+                                <#else>
+                                    无
+                                </#if>
+
+                               <#-- <#if customer.sendLogisticsNo??>
+                                    寄出：<a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${customer.sendLogisticsNo!''}&billName=${customer.sendLogisticsCompany!''}',300,400);">${customer.sendLogisticsNo!''}</a><br>
+                                <#elseif customer.salesOrderList?? &&  (customer.salesOrderList?size > 0)>
+                                </#if>-->
+                                /
+                                <#if customer.salesOrderList?? &&  (customer.salesOrderList?size > 0)>
                                     寄出：
-                                    <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${customer.sendLogisticsNo!''}&billName=${customer.sendLogisticsCompany!''}',300,400);">${customer.sendLogisticsNo!''}</a><br>
+                                    <#list customer.salesOrderList as salesOrder>
+                                        <a onclick="openLogistics('物流信息','${path}/admin/detect/to_view_logistics?billCode=${salesOrder.salesPostNum!''}&billName=${salesOrder.salesPostFirm!''}',300,400);">${salesOrder.salesPostNum!''}</a>,
+                                    </#list>
+                                <#else>
+                                    无
                                 </#if>
+
                             </td>
                             <td id="txt_customerIsSolve">
                                 <#if customer.procMethodIsBack?? && customer.procMethodIsSend??>
@@ -589,6 +600,13 @@
     }
 
     /**
+     *到添加订单页面
+     */
+    function to_add_order(salesCustomerId){
+        window.location.href=root_path + '/admin/salesOrder/to_add_order?salesCustomerId='+salesCustomerId;
+    }
+
+    /**
      * 将未解决状态修改为已解决
      */
     function updateCustomerIsSolve(customerId) {

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

@@ -525,27 +525,32 @@
                 </div>
             </div>
         </div>
+
         <div <#if procMethod.procMethodIsSend == 1>class="tabCon"</#if>style="display: none;">
+
+            <table class="table table-border table-bg table-bordered" style="margin-top: 10px;display: none;" id="sendSalesOrder">
+                <thead>
+                    <tr class="text-c" id="">
+                        <th style="text-align: center;" width="20" >订单号</th>
+                        <th style="text-align: center;" width="20" >收件人信息</th>
+                        <th style="text-align: center;" width="10">状态</th>
+                        <th style="text-align: center;" width="20">物流信息</th>
+                        <th style="text-align: center;" width="30">产品</th>
+                    </tr>
+                </thead>
+                <tbody id="sendSalesOrdertbody">
+                </tbody>
+            </table>
+
             <div class="row cl">
-                <div class="formControls col-2 col-sm-2 text-r">
-                    <strong>是否寄出</strong>
-                </div>
-                <div class="formControls col-10 col-sm-10 skin-minimal">
-                    <div class="radio-box">
-                        <input type="radio" id="tel-10" name="relationSendStatus" value="1" seleType="sendInformation">
-                        <label for="tel-10">未寄出</label>
-                    </div>
-                    <div class="radio-box">
-                        <input type="radio" id="tel-11" name="relationSendStatus" value="2" seleType="sendInformation">
-                        <label for="tel-11">已寄出</label>
-                    </div>
-                    <div class="radio-box">
-                        <input type="radio" id="tel-12" name="relationSendStatus" value="3" seleType="sendInformation">
-                        <label for="tel-12">已收货</label>
-                    </div>
+
+                <div class="formControls col-5 col-sm-5">
+                    <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;" id="" name="" onclick="to_add_order_by_update()">录入寄出订单</button>
                 </div>
             </div>
-            <div class="row cl">
+
+
+           <#-- <div class="row cl">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>Efast订单号</strong>
                 </div>
@@ -627,8 +632,10 @@
                     <div class="formControls col-8 col-sm-8 text-c">
                         <button onClick="update_relation_info(3);" class="btn btn-primary" type="button">确认修改</button>
                     </div>
-                </div>
-            </div>
+                </div>-->
+        </div>
+
+
         <div <#if procMethod.procMethodIsBack == 1>class="tabCon"</#if>>
                 <div class="row cl" id="informationInformation">
                     <div class="formControls col-2 col-sm-2 text-r">
@@ -1671,6 +1678,8 @@
         get_cmRelation_info();
         showUpdateSendProduct();
         get_product_type();
+
+        get_customer();
         /*/!* 监听寄回状态按钮 *!/
         $("input[name='renewedBackStatus']").change(function (){
             initBackInfo($(this).val());
@@ -2314,6 +2323,64 @@
             }
         })
     }
+
+    /*获取客诉信息*/
+    function get_customer() {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"customerId":${customerId}},
+            url: "${path}/admin/customer/get_customer",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    var salesOrderList = data.returnMsg.salesOrderList;
+                    if(salesOrderList!=null && salesOrderList.length > 0){
+                        $("#sendSalesOrder").show();
+                    }
+                    for (var i=0;i<salesOrderList.length;i++){
+                        var salesOrder = salesOrderList[i];
+                        var status = '';
+                        if(salesOrder.salesShippingStatus == 0){ //发货状态 0(未发货)1(已发货,即已扫描出库)3(备货中)4（收货） 11(已通知配货，后加)
+                            status = '未发货';
+                        }else if(salesOrder.salesShippingStatus == 1){
+                            status = '已发货';
+                        }else if(salesOrder.salesShippingStatus == 11){
+                            status = '已通知配货';
+                        }
+                        var product = '';
+                        for(var k=0;k<salesOrder.salesOrderItemList.length;k++){
+                            var Item = salesOrder.salesOrderItemList[k];
+                            product += Item.itemProductName+"("+ Item.itemProductColor +")" +"*"+ Item.itemNum;
+                            if(salesOrder.salesOrderItemList.length > 1){
+                                product += "<br>";
+                            }
+                        }
+                        var html = ' <tr class="text-c">'
+                            +'<td>'+ salesOrder.salesDealCode +'</td>'
+                            +'<td>'+ salesOrder.salesAddressName +'<br>'+ salesOrder.salesAddressTel +'</td>'
+                            +'<td>'+ status +'</td>'
+                            +'<td>'+ cufte(salesOrder.salesPostFirm) +'<br>'+ cufte(salesOrder.salesPostNum)
+                            +'</td>'
+                            +'<td>'+ product +'</td>'
+                            +'</tr>';
+                        $("#sendSalesOrdertbody").append(html)
+                    }
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        })
+    }
+
+    /**
+     *到添加订单页面
+     */
+    function to_add_order_by_update(){
+        var customerId = ${customerId};
+        parent.to_add_order(customerId);
+        parent.layer.close(parent.layer.getFrameIndex(window.name));
+    }
 </script>
 </body>
 </html>

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

@@ -279,6 +279,8 @@
 
 <script type="text/javascript">
 
+    var salesCustomerId = ${salesOrder.salesCustomerId!''};
+
     $('.skin-minimal input').iCheck({
         checkboxClass: 'icheckbox-blue',
         radioClass: 'iradio-blue',
@@ -286,6 +288,12 @@
     });
     var ulc = initAddress($(".address_info"));
     var sc = $(".sales_channel").initSalesChannel();
+    
+    $(function () {
+       if(isEmpty(salesCustomerId)){
+           setSelectCustomer(salesCustomerId);
+       }
+    })
 
     $("#store_1").on("input",function(){
         var $options=$("#datalist_1").children();

watero-rst-web/src/main/webapp/common/js/salesOrder/salesOrder.js

@@ -30,7 +30,7 @@ $(function(){
             $("#salesCustomerIdHtml").html("未选择客诉编号！");
         }
     })
-})
+});
 
 $(function(){
     var loadIndex = 0;
@@ -131,7 +131,7 @@ function setSelectCustomer(customerId){
                 $("#salesAddressName").val(customer.customerName);
                 $("#salesAddressTel").val(customer.customerTel);
                 /* 售后订单的支付时间、支付方式默认 */
-                $("#salesPayTime").val(customer.salesTime);
+                $("#salesPayTime").val(customer.salesTime+" 08:00:00");
                 // sc.setUlcById(0,1,11);
                 // ulc.setUlcByName(0,"省","市","区");
             }else{