售后流程修改

watero-rst-core/src/main/java/com.iamberry.rst.core/order/OrderBatch.java

@@ -42,6 +42,8 @@ public class OrderBatch  implements  Serializable{
 
     private Integer salesAdminId;   //录入人id
 
+    private Integer salesCompanyId;   //销售公司ID
+
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern="yyyy-MM-dd",timezone = "GMT+8")
     private Date startDate;                 //开始时间
@@ -168,4 +170,12 @@ public class OrderBatch  implements  Serializable{
     public void setNoticeDistNum(Integer noticeDistNum) {
         this.noticeDistNum = noticeDistNum;
     }
+
+    public Integer getSalesCompanyId() {
+        return salesCompanyId;
+    }
+
+    public void setSalesCompanyId(Integer salesCompanyId) {
+        this.salesCompanyId = salesCompanyId;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/order/mapper/orderBatchMapper.xml

@@ -39,6 +39,9 @@
             <if test="endDate != null and endDate != ''">
                 AND sales_create_time <![CDATA[<=]]> #{endDate}
             </if>
+            <if test="salesCompanyId != null and salesCompanyId != ''">
+                AND soi.sales_company_id = #{salesCompanyId}
+            </if>
         </where>
         GROUP BY soi.sales_batch_id
         ORDER BY t.batch_create_time DESC

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

@@ -116,7 +116,7 @@ public class AdminOrderBatchController {
             if(so.getSalesStatus() == 1 && so.getSalesShippingStatus() == 0){  //salesStatus
                 SalesOrder newOrder = new SalesOrder();
                 newOrder.setSalesId(so.getSalesId());
-                newOrder.setSalesOrderId(salesOrder.getSalesDealCode());
+                newOrder.setSalesOrderId(so.getSalesDealCode());
                 newOrder.setSalesShippingStatus(11);
                 newOrder.setSalesWarehouseId(warehouseId);
                 salesOrderService.noticeDistribution(newOrder);

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

@@ -69,12 +69,14 @@ public class AdminSalesOrderStatController {
     public ResponseJson listOrderPage(HttpServletRequest request, SalesOrder salesOrder) throws Exception {
         ResponseJson rj = ResponseJson.getSUCCESS();
         salesOrder.setIsCustmerAddOrder(2);
-
         List<SalesOrder> salesOrderList = new ArrayList();
-
         List<ProcMethod> procMethodList = procMethodService.getProcMethodList(new ProcMethod());
-        List<CompanyInfo> companyInfoList = companyInfoService.listCompanyInfo(new CompanyInfo());
-
+        List<CompanyInfo> companyInfoList = new ArrayList<>();
+        if(salesOrder.getSalesCompanyId() != null && !salesOrder.getSalesCompanyId().equals("")){
+            companyInfoList.add(companyInfoService.getCompanyInfoById(salesOrder.getSalesCompanyId()));
+        }else{
+            companyInfoList = companyInfoService.listCompanyInfo(new CompanyInfo());
+        }
         for (CompanyInfo companyInfo:companyInfoList) {
             salesOrder.setProcMethodId(null);
             salesOrder.setSalesCompanyId(companyInfo.getCompanyId());
@@ -101,6 +103,8 @@ public class AdminSalesOrderStatController {
     @RequiresPermissions("salesOrder:select:salesOrder")
     public ModelAndView selectSalesOrder(HttpServletRequest request) throws Exception {
         ModelAndView mv = new ModelAndView("order/statistics/sell_order_statistics");
+        String salesCompanyId = request.getParameter("salesCompanyId");
+        mv.addObject("salesCompanyId",salesCompanyId);
         return mv;
     }
 }

watero-rst-web/src/main/webapp/WEB-INF/views/order/statistics/sell_order_statistics.ftl

@@ -63,7 +63,7 @@
                     </tbody>
                 </table>
             </div>
-
+            <input type="hidden"  value="${salesCompanyId!''}" id="salesCompanyId" name="salesCompanyId">
         </form>
     </div>
 
@@ -100,6 +100,7 @@
     });
 
     function getOrderStatistics(){
+        var salesCompanyId = $("#salesCompanyId").val();
         var startDate =  $("#startDate").val();
         var endDate =  $("#endDate").val();
 
@@ -111,7 +112,8 @@
             url: '${path}/admin/salesOrderStat/sell_order_stat',
             data:{
                 startDate : startDate,
-                endDate : endDate
+                endDate : endDate,
+                salesCompanyId : salesCompanyId
             },
             dataType: 'json',
             success:function(res) {