客诉修改

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

@@ -413,10 +413,18 @@ public class AwaitSendController {
      */
     @RequiresPermissions("salesOrder:send:salesOrder")
     @RequestMapping(value = "/to_manual_delivery")
-    public ModelAndView toDistributionPostFirm(HttpServletRequest request,String salesId) {
+    public ModelAndView toDistributionPostFirm(HttpServletRequest request,Integer salesId) {
         ModelAndView mv = new ModelAndView("order/salesOrder/manual_delivery");
         List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
+        SalesOrder salesOrder = salesOrderService.getSalesOrderById(salesId);
+        String salesPostFirm = null;
+        for (LogisticsInfo lo : logisticsInfoList){
+            if(lo.getLogisticsRstCode().equals(salesOrder.getSalesPostFirm())){
+                salesPostFirm = lo.getLogisticsName();
+            }
+        }
         mv.addObject("logisticsInfoList",logisticsInfoList);
+        mv.addObject("salesPostFirm",salesPostFirm);
         mv.addObject("salesId",salesId);
         return mv;
     }

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

@@ -32,11 +32,12 @@
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box"  >
             <span class="input-dic spanhidth" style="margin-top: 5px;margin-left: 110px;">快递方式：</span>
-            <select class="my-select" name="salesPostFirm" id="salesPostFirm" style="height: 36px;width: 200px">
+           <#-- <select class="my-select" name="salesPostFirm" id="salesPostFirm" style="height: 36px;width: 200px">
                 <#list logisticsInfoList as logisticsInfo>
-                    <option value="${logisticsInfo.logisticsRstCode}">${logisticsInfo.logisticsName}</option>
+                    <option value="${logisticsInfo.logisticsRstCode}" >${logisticsInfo.logisticsName}</option>
                 </#list>
-            </select>
+            </select>-->
+            ${salesPostFirm!''}
         </div>
 
         <div class="input-box"  >