优化客服提出的问题

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

@@ -39,9 +39,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * 订单信息
@@ -798,28 +796,30 @@ public class AdminSalesOrderController {
                                       SalesOrder salesOrder,
                                       String orderItemString
     ) throws Exception {
-        ResponseJson rj = new ResponseJson();
-
         JSONArray jsonArray = JSONArray.fromObject(orderItemString);
-        List<SalesOrderItem> salesOrderItemList = (List) JSONArray.toCollection(jsonArray, SalesOrderItem.class);
-        for (SalesOrderItem salesOrderItem:salesOrderItemList) {
+        List salesOrderItemList = ((List)JSONArray.toCollection(jsonArray, SalesOrderItem.class));
+        for (Object temp:salesOrderItemList) {
+            SalesOrderItem salesOrderItem = (SalesOrderItem) temp;
             if(salesOrderItem.getItemNum() > 0 && salesOrderItem.getItemColorId() > 0){
                 ProductColor productColor = productService.getProduceColor(salesOrderItem.getItemColorId());
                 if(productColor == null){
                     return  new ResponseJson(500, "商品不存在", 500);
                 }
-                salesOrderItem.setItemProductId(productColor.getColorProductId());  ////产品id
+                ////产品id
+                salesOrderItem.setItemProductId(productColor.getColorProductId());
                 salesOrderItem.setItemColorId(productColor.getColorId());
                 salesOrderItem.setItemProductType(productColor.getProductType());
                 salesOrderItem.setItemProductName(productColor.getProductName());
                 salesOrderItem.setItemProductPic(productColor.getColorPicture());
                 salesOrderItem.setItemProductColor(productColor.getColorName());
-                salesOrderItem.setItemColorBar(productColor.getColorBar()); ///产品SKU码(百胜)
+                ///产品SKU码(百胜)
+                salesOrderItem.setItemColorBar(productColor.getColorBar());
                 salesOrderItem.setItemProductPrice(productColor.getColorPrice());
                 salesOrderItem.setItemProductDiscount(productColor.getColorDiscount());
                 salesOrderItem.setItemCreateTime(new Date());
                 salesOrderItem.setItemIsSource(1);
-                salesOrderItem.setItemOrderId(salesOrder.getSalesId()); //---- updata new add
+                //---- updata new add
+                salesOrderItem.setItemOrderId(salesOrder.getSalesId());
             }else{
                 return  new ResponseJson(500, "添加商品错误", 500);
             }
@@ -1014,5 +1014,22 @@ public class AdminSalesOrderController {
         return mv;
     }
 
+    /**
+     * 【仓库】进入导出订单页面
+     * @param request
+     * @param salesOrder
+     * @return
+     */
+    @RequestMapping("/to_download_order_excel_by_store")
+    @RequiresPermissions("salesOrder:download:Logistics")
+    public ModelAndView downloadOrderExcelByStore(HttpServletRequest request, SalesOrder salesOrder) {
+        ModelAndView mv = new ModelAndView("order/salesOrder/download_order_store");
+        List<StoreInfo> listStoreInfo = storeInfoService.listStore(new StoreInfo());
+        List<LogisticsInfo> logisticsInfoList = logisticsInfoService.getLogisticsInfoList(new LogisticsInfo());
+        mv.addObject("listStoreInfo",listStoreInfo);
+        mv.addObject("logisticsInfoList",logisticsInfoList);
+        return mv;
+    }
+
 
 }

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

@@ -56,7 +56,15 @@ public class AwaitSendController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AwaitSendController.class);
 
-    // 仓库查询待发货订单
+    /**
+     * 仓库查询待发货订单
+     * @param request
+     * @param salesOrder
+     * @param pageSize
+     * @param pageNO
+     * @param totalNum
+     * @return
+     */
     @RequestMapping("/listAwaitSendOrder")
     @RequiresPermissions("order:listAwaitSendOrder")
     public ModelAndView listAwaitSendOrder(HttpServletRequest request, SalesOrder salesOrder,
@@ -161,7 +169,14 @@ public class AwaitSendController {
         return new ModelAndView("order/salesOrder/print_order").addObject("page", postMap).addObject("orderSize", pagedResult.getDataList().size()).addObject("errorOrderNum", errorOrderNum);
     }
 
-    // 打单发货
+    /**
+     * 打单发货
+     * @param post
+     * @param orderId
+     * @param salesId
+     * @param request
+     * @return
+     */
     @ResponseBody
     @RequestMapping("/printOrder")
     @RequiresPermissions("order:listAwaitSendOrder")
@@ -221,39 +236,40 @@ public class AwaitSendController {
         }
 
         // 获取收件人邮编
-        String PostCode = AddrUtil.getPostCode(addrs[2]);
-        if (PostCode == null || "".equals(PostCode)) {
-            PostCode = AddrUtil.getPostCode(addrs[1]);
+        String postCode = AddrUtil.getPostCode(addrs[2]);
+        if (postCode == null || "".equals(postCode)) {
+            postCode = AddrUtil.getPostCode(addrs[1]);
         }
-        if (PostCode == null || "".equals(PostCode)) {
-            PostCode = AddrUtil.getPostCode(addrs[0]);
+        if (postCode == null || "".equals(postCode)) {
+            postCode = AddrUtil.getPostCode(addrs[0]);
         }
 
-        Map<String, Object> Receiver = new HashMap<String, Object>();
-        Receiver.put("Name", salesOrderInfo.getSalesAddressName());
-        Receiver.put("Tel", salesOrderInfo.getSalesAddressTel());
-        Receiver.put("ProvinceName", AddrUtil.dealProvince(addrs[0]));
-        Receiver.put("CityName", addrs[1]);
-        Receiver.put("ExpAreaName", addrs[2]);
-        Receiver.put("Address", salesOrderInfo.getSalesAddressInfo());
-        Receiver.put("PostCode", PostCode);
-        eOrderRequestData.Receiver = (Receiver);
+        Map<String, Object> receiver = new HashMap<String, Object>();
+        receiver.put("Name", salesOrderInfo.getSalesAddressName());
+        receiver.put("Tel", salesOrderInfo.getSalesAddressTel());
+        receiver.put("ProvinceName", AddrUtil.dealProvince(addrs[0]));
+        receiver.put("CityName", addrs[1]);
+        receiver.put("ExpAreaName", addrs[2]);
+        receiver.put("Address", salesOrderInfo.getSalesAddressInfo());
+        receiver.put("PostCode", postCode);
+        eOrderRequestData.Receiver = (receiver);
         // 发件人信息
-        Map<String, Object> Sender = new HashMap<String, Object>();
-        Sender.put("Name", storeShip.getStoreShipName());
-        Sender.put("Tel", storeShip.getStoreShipTel());
-        Sender.put("ProvinceName", storeShip.getStoreShipProvince());
-        Sender.put("CityName", storeShip.getStoreShipCity());
-        Sender.put("ExpAreaName", "清溪镇");
-        Sender.put("Address", storeShip.getStoreShipAddress());
-        Sender.put("PostCode", "523660");
-        eOrderRequestData.Sender = (Sender);
+        Map<String, Object> sender = new HashMap<String, Object>();
+        sender.put("Name", storeShip.getStoreShipName());
+        sender.put("Tel", storeShip.getStoreShipTel());
+        sender.put("ProvinceName", storeShip.getStoreShipProvince());
+        sender.put("CityName", storeShip.getStoreShipCity());
+        sender.put("ExpAreaName", "清溪镇");
+        sender.put("Address", storeShip.getStoreShipAddress());
+        sender.put("PostCode", "523660");
+        eOrderRequestData.Sender = (sender);
         // 产品信息
-        List<Map<String, Object>> Commodity = new ArrayList<>();
+        List<Map<String, Object>> commodity = new ArrayList<>();
         SalesOrderItem item = new SalesOrderItem();
         item.setItemOrderId(salesOrderInfo.getSalesId());
         List<SalesOrderItem> items = salesOrderService.listSalesOrderItem(item);
-        Double colorIsWeight = 0.00;  //克
+        // 整个产品的重量
+        Double colorIsWeight = 0.00;
         String goodName = "";
         int Goodsquantity = 0;
         for (SalesOrderItem temp : items) {
@@ -269,9 +285,9 @@ public class AwaitSendController {
         product1.put("Goodsquantity", Goodsquantity);
         // 计算产品重量
         product1.put("GoodsWeight", colorIsWeight/1000);
-        Commodity.add(product1);
+        commodity.add(product1);
 
-        eOrderRequestData.Commodity = (Commodity);
+        eOrderRequestData.Commodity = (commodity);
         eOrderRequestData.Weight = (colorIsWeight/1000);
         eOrderRequestData.Quantity = (1);
         eOrderRequestData.IsReturnPrintTemplate = (1);
@@ -299,7 +315,9 @@ public class AwaitSendController {
                     dir.mkdir();
                 }
                 File file = new File(dir.getAbsolutePath() + File.separator + orderId + ".txt");
-                file.createNewFile();
+                if (!file.createNewFile()) {
+                    return ResponseJson.getFAILURE().addResponseKeyValue("error", "创建文件失败");
+                }
                 FileWriter fileWriter = null;
                 try {
                     fileWriter = new FileWriter(file, false);

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

@@ -0,0 +1,113 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="renderer" content="webkit|ie-comp|ie-stand">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no" />
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <link rel="Bookmark" href="/favicon.ico" >
+    <link rel="Shortcut Icon" href="/favicon.ico" />
+    <#include "/base/list_base.ftl">
+    <title>订单下载</title>
+    <style>
+        *{padding: 0;margin: 0;}
+        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
+        .my-select{border: 1px solid rgba(0,0,0,.1);height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .table-bg thead th{background-color: #e2f6ff;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
+        .my-order{left: 0px;cursor:pointer; position: absolute;border-bottom: 1px solid rgb(255, 255, 255);float: left;width: 110px;height: 36px;}
+    </style>
+</head>
+<body>
+<!--  录入订单 -->
+<div class="page-container">
+    <div class="" id="form-download">
+        <form action="" method="post" style="margin-left: 24px;">
+                <select class="my-select" name="salesIsDownload" id="salesIsDownload" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;display: none">
+                    <option value ="">导出状态</option>
+                    <option value ="2" >已导出</option>
+                    <option value ="1" >未导出</option>
+                </select>
+
+                <select class="my-select" name="salesShippingStatus" id="salesShippingStatus" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                    <option value ="11" >已通知配货</option>
+                    <option value ="1" selected>已发货</option>
+                </select>
+
+                <select class="my-select" name="salesDeliver" id="salesDeliver" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
+                    <option value ="">出库状态</option>
+                    <option value ="1" >未出库</option>
+                    <option value ="2" >已出库</option>
+                </select>
+
+                <select class="my-select" name="salesStatus" id="salesStatus" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;display: none">
+                    <option value ="">确认状态</option>
+                    <option value ="0" >未确认</option>
+                    <option value ="1" >确认</option>
+                    <option value ="2" >挂起</option>
+                </select>
+
+                <select name="salesStoreId" id="salesStoreId" class="my-select" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;"">
+                    <option value="">店铺</option>
+                    <#if listStoreInfo?? &&  (listStoreInfo?size > 0) >
+                        <#list listStoreInfo as info>
+                            <option value="${info.storeId!''}" <#if salesOrder.salesStoreId??><#if salesOrder.salesStoreId == info.storeId >selected="selected"</#if></#if>>${info.storeName!''}</option>
+                        </#list>
+                    </#if>
+                </select>
+
+            <input type="text" style="width:120px;height:36px;margin-right: 0px;" name="startDate" id="startDate" class="input-text" placeholder="开始时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.startDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>
+            <input type="text" style="width:120px;height:36px;margin-right: 0px;" name="endDate" id="endDate" class="input-text" placeholder="结束时间" onClick="WdatePicker({ dateFmt:'yyyy-MM-dd HH:mm:ss',skin:'whyGreen' })" value="${(salesOrder.endDate?string("yyyy-MM-dd HH:mm:ss"))!''}" readonly="readonly"/>
+            <input type="text" class="my-input trim_input"  style="width:120px;margin-right: 0px;padding: 0px;" value="${salesOrder.salesBatchId!}" placeholder="订单批次号" name="salesBatchId" id="salesBatchId">
+            <button onClick="download();" class="btn radius" style="background: #32a3d8;color: #fff;width: 120px" type="button" title="下载订单">下载订单</button>
+        </form>
+    </div>
+</div>
+<script type="text/javascript">
+        function download(){
+            var salesIsDownload = $("#salesIsDownload").val(); //是否导出
+            var salesStatus = $("#salesStatus").val();; //订单状态
+            var salesShippingStatus = $("#salesShippingStatus").val(); //是否已发货
+            var salesDeliver = $("#salesDeliver").val(); //是否已发货
+            var salesStoreId = $("#salesStoreId").val(); //店铺
+            var startDate = $("#startDate").val();
+            var endDate = $("#endDate").val();
+            var salesBatchId = $("#salesBatchId").val();
+            $.ajax({
+                type:'POST',
+                url: '${path}/admin/order/val_download_order_excel',
+                data:{
+                    "salesIsDownload" : salesIsDownload,
+                    "salesStatus" : salesStatus,
+                    "salesShippingStatus" : salesShippingStatus,
+                    "salesDeliver" : salesDeliver,
+                    "salesStoreId" : salesStoreId,
+                    "startDate" : startDate,
+                    "endDate" : endDate,
+                    "salesBatchId" : salesBatchId
+                },
+                dataType: 'json',
+                async: false,
+                success:function(res) {
+                    if(res.returnCode != 200){
+                        layer.msg(res.resultMsg,{icon: 2,time:3000});
+                        return false;
+                    }else{
+                        window.location="${path}/admin/order/download_order_excel?"
+                                +"salesIsDownload="+salesIsDownload
+                                +"&salesStatus="+salesStatus
+                                +"&salesShippingStatus="+salesShippingStatus
+                                +"&salesDeliver="+salesDeliver
+                                +"&salesStoreId="+salesStoreId
+                                +"&startDate="+startDate
+                                +"&endDate="+endDate
+                                +"&salesBatchId="+salesBatchId;
+                    }
+                }
+            });
+        }
+    </script>
+</body>
+</html>

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

@@ -249,7 +249,7 @@
      * 跳转到下载页面
      */
     function downloadOrderPage(){
-        layer_show("商品列表","${path}/admin/salesOrder/to_download_order_excel","600","250");
+        layer_show("导出订单","${path}/admin/salesOrder/to_download_order_excel_by_store","600","250");
     }
 </script>
 

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

@@ -17,6 +17,7 @@
         .my-select{border: 1px solid rgba(0,0,0,.1);height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
         .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
         .table-bg thead th{background-color: #e2f6ff;}
+        .order-addresss{white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: 100px}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #effaff;border: 1px solid #32a3d8;}
         /*input[type=radio]{-webkit-appearance:none;appearance:none;background: url(/rst/common/images/pts/radio-1.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(/rst/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}*/
@@ -102,17 +103,12 @@
                 <th width="16"><input type="checkbox" ></th>
                 <th width="50">订单类型</th>
                 <th width="60">订单号</th>
-                <th width="70">交易号</th>
                 <th width="72">批次号</th>
-                <th width="60">收货人姓名</th>
-                <th width="70">收货人电话</th>
+                <th width="70">姓名/电话</th>
                 <th width="100">收货地址</th>
                 <th width="50">是否发货</th>
                 <th width="60">订单状态</th>
                 <th width="60">物流信息</th>
-                <#--<th width="50">订单金额</th>
-                <th width="50">支付金额</th>
-                <th width="50">是否付款</th>-->
                 <th width="50">用户备注</th>
                 <th width="50">产品</th>
                 <th width="65">创建时间</th>
@@ -126,40 +122,45 @@
                     <td width="16"><input type="checkbox" class="sales_id" value="${order.salesId!''}" ></td>
                     <td width="16">
                         <#if (order.salesCustomerId)??>
-                            <div>售后订单</div>
                             <div>
-                                (
                                 <#if order.customerIsSolve == 1>
                                     已解决
                                 <#elseif order.customerIsSolve == 2>
                                     未解决
                                 <#elseif order.customerIsSolve == 3>
-                                    换新
+                                    换
                                 <#elseif order.customerIsSolve == 4>
-                                    维修
+                                    修
                                 <#elseif order.customerIsSolve == 5>
-                                    补发
+                                    补
                                 <#elseif order.customerIsSolve == 6>
-                                    退货
+                                    退
                                 <#elseif order.customerIsSolve == 7>
                                     无理由退货
                                 </#if>
-                                )
                             </div>
                         <#else>
-                            正常订单
+                            正常
                         </#if>
                     </td>
                     <td>${order.salesOrderId!''}</td>
-                    <td>${order.salesDealCode!''}</td>
                     <td>${order.salesBatchId!''}</td>
-                    <td>${order.salesAddressName!''}</td>
-                    <#if (order.salesAddressTel)?? && order.salesAddressTel?length gt 7>
-                        <td>${order.salesAddressTel?substring(0,3)}***${order.salesAddressTel?substring(order.salesAddressTel?length-4,order.salesAddressTel?length)}</td>
-                    <#else>
-                        <td>${order.salesAddressTel!''}</td>
-                    </#if>
-                    <td>${order.salesAddressInfo!''}</td>
+                    <td>${order.salesAddressName!''}
+                        <p>
+                            <#if (order.salesAddressTel)?? && order.salesAddressTel?length gt 7>
+                                ${order.salesAddressTel?substring(0,3)}***${order.salesAddressTel?substring(order.salesAddressTel?length-4,order.salesAddressTel?length)}
+                            <#else>
+                                ${order.salesAddressTel!''}
+                            </#if>
+                        </p>
+                    </td>
+                    <td alt="${order.salesAddressInfo!''}" title="${order.salesAddressInfo!''}">
+                        <#if order.salesAddressInfo?length gt 15>
+                            ${order.salesAddressInfo?substring(0,12)}...
+                        <#else>
+                            ${order.salesAddressInfo!''}
+                        </#if>
+                    </td>
                     <td>
                         <#if order.salesShippingStatus == 0>
                             未发货
@@ -201,7 +202,7 @@
                         </#if>
                     </td>-->
                     <td>${order.salesUserRemark!''}</td>
-                    <td>
+                    <td style="text-align: left;">
                         <#if order.salesOrderItemList ??>
                             <#list order.salesOrderItemList as d>
                                 <span class="label label-success radius">${(d.itemProductName)!}(${(d.itemProductColor)!})*${(d.itemNum)!}</span>
@@ -210,7 +211,7 @@
                     </td>
 
                     <td>
-                        ${(order.salesCreateTime?string("yyyy-MM-dd"))!''}</br>
+                        ${(order.salesCreateTime?string("yy-MM-dd"))!''}</br>
                         ${(order.salesCreateTime?string("HH:mm:ss"))!''}
                     </td>
                     <td>
@@ -236,7 +237,7 @@
                 </tr>
                 </#list>
             <#else>
-                <tr><td colspan="15" class="td-manage text-c" >暂时没有订单信息，请添加！</td></tr>
+                <tr><td colspan="13" class="td-manage text-c" >暂时没有订单信息，请添加！</td></tr>
             </#if>
             </tbody>
         </table>