订单中心优化

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -69,9 +69,6 @@
       <if test="isDeliverGoods !=null and isDeliverGoods !=''">
         AND sales_shipping_status = #{isDeliverGoods}
       </if>
-      <if test="storeName !=null and storeName !=''">
-        AND sales_store_id = #{storeName}
-      </if>
       <if test="salesStatus !=null and salesStatus !=''">
         AND sales_status = #{salesStatus}
       </if>

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

@@ -86,8 +86,10 @@ public class AdminSalesOrderController {
         if (totalNum != 0) {
             pagedResult.setTotal(totalNum);
         }
+        List<StoreInfo> listStoreInfo = storeInfoService.listStore(new StoreInfo());
         salesOrder.setSalesOrderItemList(null);
         StitchAttrUtil.setModelAndView(salesOrder, mv, "/admin/salesOrder/list_order_page", pagedResult);
+        mv.addObject("listStoreInfo",listStoreInfo);
         return mv;
     }
 

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

@@ -595,6 +595,8 @@ public class AdminOrderController {
     public ModelAndView uploadExcel(@RequestParam("file") String file, HttpServletRequest request) throws IOException {
         ModelAndView mv = new ModelAndView("order/excel_to_order");
         // 到设置页面
+        List<StoreInfo> listStoreInfo = storeInfoService.listStore(new StoreInfo());
+        mv.addObject("listStoreInfo",listStoreInfo);
         mv.addObject("heads", ExcelUtil.readExcelHead(request.getServletContext().getRealPath(file)));
         mv.addObject("productUrl", file);
         return mv;

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

@@ -14,7 +14,7 @@
         *{padding: 0;margin: 0;}
         .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 32px;margin-right: 10px;}
         /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
-        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;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-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;}
@@ -64,14 +64,14 @@
                     <option value ="1" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "1" >selected="selected"</#if></#if>>不需要回访</option>
                     <option value ="2" <#if customerInfo.customerIsVisit??><#if customerInfo.customerIsVisit == "2" >selected="selected"</#if></#if>>需要回访</option>
                 </select>-->
-                <select class="my-select" name="isHaveImport" id="isHaveImport" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+                <select class="my-select" name="isHaveImport" id="isHaveImport" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
                     <option value ="">是否已导出过</option>
                     <#--<option value ="1">是</option>
                     <option value ="2">否</option>-->
-                    <option value ="1" <#if salesOrder.isHaveImport??><#if salesOrder.isHaveImport == "1" >selected="selected"</#if></#if>>是</option>
-                    <option value ="2" <#if salesOrder.isHaveImport??><#if salesOrder.isHaveImport == "2" >selected="selected"</#if></#if>>否</option>
+                    <option value ="2" <#if salesOrder.isHaveImport??><#if salesOrder.isHaveImport == "2" >selected="selected"</#if></#if>>是</option>
+                    <option value ="1" <#if salesOrder.isHaveImport??><#if salesOrder.isHaveImport == "1" >selected="selected"</#if></#if>>否</option>
                 </select>
-                <select class="my-select" name="isDeliverGoods" id="isDeliverGoods" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
+                <select class="my-select" name="isDeliverGoods" id="isDeliverGoods" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;">
                     <option value ="">是否已发货</option>
                     <#--<option value ="1">是</option>
                     <option value ="2">否</option>-->
@@ -79,10 +79,15 @@
                     <option value ="0" <#if salesOrder.isDeliverGoods??><#if salesOrder.isDeliverGoods == "0" >selected="selected"</#if></#if>>否</option>
                 </select>
                 <#--<input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.storeName!}" placeholder="店铺" name="storeName" id="storeName">-->
-                <select name="efastStoreName" id="efastStoreName" class="select" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;"">
-                    <option value="">店铺</option>
-                    <option value="4" <#if salesOrder.storeName??><#if salesOrder.storeName == "4" >selected="selected"</#if></#if>>微商/代理商</option>
-                    <option value="11" <#if salesOrder.storeName??><#if salesOrder.storeName == "11" >selected="selected"</#if></#if>>微信平台商</option>
+                <select name="salesStoreId" id="salesStoreId" class="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>
+                    <#--<option value="4" <#if salesOrder.storeName??><#if salesOrder.storeName == "004" >selected="selected"</#if></#if>>微商/代理商</option>
+                    <option value="11" <#if salesOrder.storeName??><#if salesOrder.storeName == "004001" >selected="selected"</#if></#if>>微信平台商</option>
                     <option value="13" <#if salesOrder.storeName??><#if salesOrder.storeName == "13" >selected="selected"</#if></#if>>上海零售</option>
                     <option value="15" <#if salesOrder.storeName??><#if salesOrder.storeName == "15" >selected="selected"</#if></#if>>小小包 </option>
                     <option value="16" <#if salesOrder.storeName??><#if salesOrder.storeName == "16" >selected="selected"</#if></#if>>伊姐团购</option>
@@ -106,7 +111,7 @@
                     <option value="34" <#if salesOrder.storeName??><#if salesOrder.storeName == "34" >selected="selected"</#if></#if>>老虎工作室</option>
                     <option value="35" <#if salesOrder.storeName??><#if salesOrder.storeName == "35" >selected="selected"</#if></#if>>有赞</option>
                     <option value="37" <#if salesOrder.storeName??><#if salesOrder.storeName == "37" >selected="selected"</#if></#if>>深圳鑫之鹏</option>
-                    <option value="38" <#if salesOrder.storeName??><#if salesOrder.storeName == "38" >selected="selected"</#if></#if>>东西儿童教育</option>
+                    <option value="38" <#if salesOrder.storeName??><#if salesOrder.storeName == "38" >selected="selected"</#if></#if>>东西儿童教育</option>-->
                 </select>
                <#-- <label class="form-label col-3 col-sm-2" style="width: 110px;margin-left: 10px;"><span class="c-red">*</span>是否已发货：</label>
                 <div class="formControls col-4 col-sm-4"style="padding: 0 0;width: 383px;">

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

@@ -90,32 +90,11 @@
                 <td>
                     <label>
                         <select name="shop-id" id="shop-id">
-                            <option value="4">微商/代理商</option>
-                            <option value="11">微信平台商</option>
-                            <option value="13">上海零售</option>
-                            <option value="15">小小包 </option>
-                            <option value="16">伊姐团购</option>
-                            <option value="17">物道团购</option>
-                            <option value="18">年糕妈妈</option>
-                            <option value="19">快抱团</option>
-                            <option value="20">北京北斗</option>
-                            <option value="21">凯叔</option>
-                            <option value="22">上海-崔玉涛育学园</option>
-                            <option value="23">简二家</option>
-                            <option value="24">科学育儿</option>
-                            <option value="25">美康辰</option>
-                            <option value="26">北京悦祺</option>
-                            <option value="27">上海淘宝</option>
-                            <option value="28">蓝极风</option>
-                            <option value="29">小莉团购</option>
-                            <option value="30">超级妈咪团</option>
-                            <option value="31">艾德叔叔</option>
-                            <option value="32">钱儿频道</option>
-                            <option value="33">尹建莉</option>
-							<option value="34">老虎工作室</option>
-							<option value="35">有赞</option>
-							<option value="37">深圳鑫之鹏</option>
-							<option value="38">东西儿童教育</option>
+                        <#if listStoreInfo?? &&  (listStoreInfo?size > 0) >
+                            <#list listStoreInfo as info>
+                                <option value="${info.storeEfast!''}" >${info.storeName!''}</option>
+                            </#list>
+                        </#if>
                         </select>
                     </label>
                 </td>