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

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

@@ -168,7 +168,7 @@ public class MallOrderController {
             salesOrder.setSalesStatus(1);
             salesOrder.setSalesSendType(2);
             salesOrder.setSalesSalesTime(add_time);
-            salesOrder.setSalesAddressInfo(province_name+"-"+city_name+"-"+district_name+"-"+address);
+            salesOrder.setSalesAddressInfo(province_name+" "+city_name+" "+district_name+" "+address);
             salesOrder.setSalesAddressTel(mobile);
             salesOrder.setSalesAddressName(consignee);
             salesOrder.setSalesAmount(total_amount);
@@ -235,7 +235,7 @@ public class MallOrderController {
         }catch (Exception e){
             map.put("msg","parameter null");
             map.put("oder_sn",new Date().getTime());
-            return null;
+            return map;
         }
         if (salesOrder == null) {
             map.put("msg","no order");

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_list.ftl

@@ -97,7 +97,8 @@
             <button type="submit" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id=""><i class="Hui-iconfont">&#xe665;</i> 搜索</button>
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="order_excel"><i class="Hui-iconfont">&#xe644;</i> 导出</button>
             <button type="button" class="btn" style="background: #32a3d8;color: #fff;-webkit-transform:translateY(-5%);height: 35px;" id="synOrder"><i class="Hui-iconfont">&#xe632;</i> 同步订单</button>
-            <button onClick="upFiles2();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont">&#xe632;</i> 上传Excel(仅支持XLS类型)</button>
+            <button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont">&#xe632;</i> 上传Excel(仅支持XLS类型)</button>
+            <button onClick="upFiles2();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont">&#xe632;</i> 上传物流信息(仅支持XLS类型)</button>
             <button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button"><i class="Hui-iconfont">&#xe640;</i> 下载订单</button>
 
             </div>
@@ -340,8 +341,8 @@
         });
     }
 
-    /*导出Excel*/
-    /*$('#order_excel').click(function (e) {
+    /*导出Excel
+    $('#order_excel').click(function (e) {
         var salesOrderId = convertUndefinedToEmpty($('#salesOrderId').val());
         var salesAddressName = convertUndefinedToEmpty($('#salesAddressName').val());
         var salesAddressTel = convertUndefinedToEmpty($('#salesAddressTel').val());