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

客诉修改

wangxiaoming 6 years ago
parent
9ac736c329
commit
85ef775b3d
2 changed files with 4 additions and 3 deletions
Unified View Show Diff Stats
  1. 2 1
      watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java
  2. 2 2
      watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/manual_delivery.ftl

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

@@ -428,6 +428,7 @@ public class AwaitSendController {
 
         mv.addObject("logisticsInfoList",logisticsInfoList);
 
         mv.addObject("logisticsInfoList",logisticsInfoList);
 
         mv.addObject("salesPostFirm",salesPostFirm);
 
         mv.addObject("salesPostFirm",salesPostFirm);
 
         mv.addObject("salesId",salesId);
 
         mv.addObject("salesId",salesId);
 
+        mv.addObject("orderSalesPostFirm",salesOrder.getSalesPostFirm());
 
         return mv;
 
         return mv;
 
     }
 
     }
 
 
 
@@ -444,7 +445,7 @@ public class AwaitSendController {
 
         if(salesOrder == null){
 
         if(salesOrder == null){
 
             return rj;
 
             return rj;
 
         }
 
         }
 
-        if(salesOrder.getSalesPostFirm() == null || salesOrder.getSalesPostNum() == null || salesOrder.getSalesId() == null){
 
+        if(salesOrder.getSalesPostNum() == null || salesOrder.getSalesId() == null){
 
             return rj;
 
             return rj;
 
         }
 
         }
 
         salesOrder.setSalesSendTime(new Date());
 
         salesOrder.setSalesSendTime(new Date());

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

@@ -25,7 +25,7 @@
 
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
 
     </style>
 
     </style>
 
     <meta name="keywords" content="${path}">
 
     <meta name="keywords" content="${path}">
 
-    <meta name="description" content="H-ui.admin v3.0，是一款由国人开发的轻量级扁平化网站后台模板，完全免费开源的网站后台管理系统模版，适合中小型CMS后台系统。">
 
+    <meta name="description" content="">
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <article class="page-container">
 
 <article class="page-container">
 
@@ -62,7 +62,7 @@
 
      */
 
      */
 
     function listSalesPostFirm(){
 
     function listSalesPostFirm(){
 
         var salesId = $("#salesId").val();
 
         var salesId = $("#salesId").val();
 
-        var salesPostFirm = $("#salesPostFirm").val();
 
+        var salesPostFirm = "${orderSalesPostFirm!''}";
 
         var salesPostNum = $("#salesPostNum").val();
 
         var salesPostNum = $("#salesPostNum").val();
 
         if (salesPostNum == null || salesPostNum === "" || typeof(salesPostNum) === "undefined") {
 
         if (salesPostNum == null || salesPostNum === "" || typeof(salesPostNum) === "undefined") {
 
             layer.msg("快递单号必须填写，空快递单号不允许发货", {icon: 5, time: 3000});
 
             layer.msg("快递单号必须填写，空快递单号不允许发货", {icon: 5, time: 3000});