Home Explore Help
Sign In
hexiugang
/
iamberry-common-parent
Watch 3
Star 3
Fork 1
Files Issues 0 Pull Requests 0 Wiki
Browse Source

客诉列表修改

liujiankang 6 years ago
parent
834916103e
commit
a674a3a58e
7 changed files with 8 additions and 21 deletions
Unified View Show Diff Stats
  1. 1 1
      watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java
  2. 2 2
      watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java
  3. 1 1
      watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/SalesOrderMapper.java
  4. 2 1
      watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml
  5. 0 14
      watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AppComplaintQuestionInfoController.java
  6. 1 1
      watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java
  7. 1 1
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl

+ 1 - 1
watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java
View File 

@@ -98,7 +98,7 @@ public interface SalesOrderService {
 
      * 查询待发货的数量
 
      * 查询待发货的数量
 
      * @return
 
      * @return
 
      */
 
      */
 
-    List<PostInfo> listWaitPrintOrderNum();
 
+    List<PostInfo> listWaitPrintOrderNum(Integer salesWarehouseId);
 
 
 
     /**
 
     /**
 
      * 仓库-代发货页面
 
      * 仓库-代发货页面

+ 2 - 2
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java
View File 

@@ -153,8 +153,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
 
     }
 
     }
 
 
 
     @Override
 
     @Override
 
-    public List<PostInfo> listWaitPrintOrderNum() {
 
-        return salesOrderMapper.listWaitPrintOrderNum();
 
+    public List<PostInfo> listWaitPrintOrderNum(Integer salesWarehouseId) {
 
+        return salesOrderMapper.listWaitPrintOrderNum(salesWarehouseId);
 
     }
 
     }
 
 
 
     @Override
 
     @Override

+ 1 - 1
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/SalesOrderMapper.java
View File 

@@ -62,7 +62,7 @@ public interface SalesOrderMapper {
 
      * 查询待发货的数量
 
      * 查询待发货的数量
 
      * @return
 
      * @return
 
      */
 
      */
 
-    List<PostInfo> listWaitPrintOrderNum();
 
+    List<PostInfo> listWaitPrintOrderNum(Integer salesWarehouseId);
 
 
 
     /**
 
     /**
 
      * 获取订单数量
 
      * 获取订单数量

+ 2 - 1
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml
View File 

@@ -358,7 +358,7 @@
 
         ORDER BY sales_create_time DESC
 
         ORDER BY sales_create_time DESC
 
     </select>
 
     </select>
 
 
 
-    <select id="listWaitPrintOrderNum" resultType="PostInfo">
 
+    <select id="listWaitPrintOrderNum" parameterType="java.lang.Integer" resultType="PostInfo">
 
         SELECT
 
         SELECT
 
             sales_post_firm "postFirm",
 
             sales_post_firm "postFirm",
 
             count(sales_post_firm) "number"
 
             count(sales_post_firm) "number"
 
@@ -367,6 +367,7 @@
 
         WHERE
 
         WHERE
 
             sales_shipping_status = 11
 
             sales_shipping_status = 11
 
         AND sales_status = 1
 
         AND sales_status = 1
 
+        AND sales_warehouse_id = #{salesWarehouseId}
 
         GROUP BY
 
         GROUP BY
 
             sales_post_firm
 
             sales_post_firm
 
     </select>
 
     </select>

+ 0 - 14
watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AppComplaintQuestionInfoController.java
View File 

@@ -49,20 +49,6 @@ public class AppComplaintQuestionInfoController {
 
 
 
     @Autowired
 
     @Autowired
 
     private ComplaintQuestionInfoService complaintQuestionInfoService;
 
     private ComplaintQuestionInfoService complaintQuestionInfoService;
 
-    @Autowired
 
-    private CustomerCommonService customerCommonService;
 
-    @Autowired
 
-    private RelationOrderService relationOrderService;
 
-    @Autowired
 
-    private SalesOrderService salesOrderService;
 
-    @Autowired
 
-    private EfastOrderService efastOrderService;
 
-    @Autowired
 
-    private ProductService productService;
 
-    @Autowired
 
-    private SeleOrdeCompUtil seleOrdeCompUtil;
 
-    @Autowired
 
-    private KuaiDi100 kuaiDi100;
 
 
 
     /**
 
     /**
 
      * 进入客诉问题描述
 
      * 进入客诉问题描述

+ 1 - 1
watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java
View File 

@@ -104,7 +104,7 @@ public class AwaitSendController {
 
             int errorOrderNum = 0;
 
             int errorOrderNum = 0;
 
             // 聚合打单方式
 
             // 聚合打单方式
 
             Map<String, Integer> postMap = new HashMap<>();
 
             Map<String, Integer> postMap = new HashMap<>();
 
-            List<PostInfo> postInfos = salesOrderService.listWaitPrintOrderNum();
 
+            List<PostInfo> postInfos = salesOrderService.listWaitPrintOrderNum(orderWarehouse.getWarehouseId());
 
             if (postInfos != null && !postInfos.isEmpty()) {
 
             if (postInfos != null && !postInfos.isEmpty()) {
 
                 for (PostInfo temp : postInfos) {
 
                 for (PostInfo temp : postInfos) {
 
                     LogisticsInfo info = new LogisticsInfo();
 
                     LogisticsInfo info = new LogisticsInfo();

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/list_wait_send_order.ftl
View File 

@@ -16,7 +16,7 @@
 
 <body style="margin-bottom: 30px">
 
 <body style="margin-bottom: 30px">
 
 
 
 <div class="page-container">
 
 <div class="page-container">
 
-    <pre style="font-size: 14px;margin-top: -1%;">待发货：<#list postMap?keys as key>${key}（${postMap[key]}）</#list></pre>
 
+    <#if postMap??><pre style="font-size: 14px;margin-top: -1%;">待发货：<#list postMap?keys as key>${key}（${postMap[key]}）</#list></pre></#if>
 
     <div class="text-c">
 
     <div class="text-c">
 
         <form action="${path}/admin/await_send/listAwaitSendOrder" method="POST" id="search-form">
 
         <form action="${path}/admin/await_send/listAwaitSendOrder" method="POST" id="search-form">
 
             <select class="select" name="salesShippingStatus" id="salesShippingStatus" style="height: 31px;width: 150px">
 
             <select class="select" name="salesShippingStatus" id="salesShippingStatus" style="height: 31px;width: 150px">