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

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

@@ -519,11 +519,11 @@ public class AdminSalesOrderController {
     @RequestMapping("/uploadLogisticsExcel")
     @ResponseBody
     public String uploadLogisticsExcel(HttpServletResponse response,HttpServletRequest request,@RequestParam("file") String file)throws IOException  {
-        Integer maxNumber = 100;
+        Integer maxNumber = 1000;
         String path = request.getServletContext().getRealPath(file);
         boolean flag = ExcelUtil.readExcelNumber(path,maxNumber);
         if(!flag){
-            return "最大上传数量为一百条，请检查文档内的数据是否符合条件！";
+            return "最大上传数量为1000条，请检查文档内的数据是否符合条件！";
         }
         List<String> listString  = ExcelUtil.readExcelHead(path);
         if(listString == null){

watero-rst-web/src/main/resources/watero-rst-ioc.xml

@@ -26,7 +26,7 @@
     <aop:aspectj-autoproxy proxy-target-class="true"/>
 
 	<!-- 开启注解启动定时器 -->
-    <task:annotation-driven/>
+    <!--<task:annotation-driven/>-->
 
 	<!-- DataSource -->
 	<import resource="classpath:watero-rst-db.xml"/>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl

@@ -229,20 +229,26 @@
                                 <#elseif customer.customerIsSolve == 3>
                                     换新(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateRenewed(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.backStatus == 1>
-                                            未寄回
-                                        <#elseif customer.backStatus == 2>
-                                            已寄回
-                                        <#elseif customer.backStatus == 3>
-                                            已收货
-                                        </#if>,
-                                        <#if customer.sendStatus == 1>
-                                            未寄送
-                                        <#elseif customer.sendStatus == 2>
-                                            已寄送
-                                        <#elseif customer.sendStatus == 3>
-                                            已收货
-                                        </#if><#--,
+                                        <font color=#06c>
+                                            <#if customer.backStatus??>
+                                                <#if customer.backStatus == 1>
+                                                    未寄回
+                                                <#elseif customer.backStatus == 2>
+                                                    已寄回
+                                                <#elseif customer.backStatus == 3>
+                                                    已收货
+                                                </#if>,
+                                            </#if>
+                                            <#if customer.sendStatus??>
+                                                <#if customer.sendStatus == 1>
+                                                    未寄送
+                                                <#elseif customer.sendStatus == 2>
+                                                    已寄送
+                                                <#elseif customer.sendStatus == 3>
+                                                    已收货
+                                                </#if>
+                                            </#if>
+                                        <#--,
                                         <#if customer.complaintDetectList?? &&  (customer.complaintDetectList?size > 0)>
                                             <#list customer.complaintDetectList as complaintDetect>
                                                 <#if (complaintDetect_index = 0)>
@@ -264,20 +270,27 @@
                                 <#elseif customer.customerIsSolve == 4>
                                     维修(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateRepair(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.backStatus == 1>
-                                            未寄回
-                                        <#elseif customer.backStatus == 2>
-                                            已寄回
-                                        <#elseif customer.backStatus == 3>
-                                            已收货
-                                        </#if>,
-                                        <#if customer.sendStatus == 1>
-                                            未寄送
-                                        <#elseif customer.sendStatus == 2>
-                                            已寄送
-                                        <#elseif customer.sendStatus == 3>
-                                            已收货
-                                        </#if><#--,
+                                        <font color=#06c>
+                                            <#if customer.backStatus??>
+                                                <#if customer.backStatus == 1>
+                                                    未寄回
+                                                <#elseif customer.backStatus == 2>
+                                                    已寄回
+                                                <#elseif customer.backStatus == 3>
+                                                    已收货
+                                                </#if>,
+                                            </#if>
+                                            <#if customer.sendStatus??>
+                                                <#if customer.sendStatus == 1>
+                                                    未寄送
+                                                <#elseif customer.sendStatus == 2>
+                                                    已寄送
+                                                <#elseif customer.sendStatus == 3>
+                                                    已收货
+                                                </#if>
+                                            </#if>
+
+                                        <#--,
                                             <#if customer.complaintDetectList?? &&  (customer.complaintDetectList?size > 0)>
                                                 <#list customer.complaintDetectList as complaintDetect>
                                                     <#if (complaintDetect_index = 0)>
@@ -298,37 +311,49 @@
                                 <#elseif customer.customerIsSolve == 5>
                                     补发(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateReissue(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.sendStatus == 1>
-                                            未寄送
-                                        <#elseif customer.sendStatus == 2>
-                                            已寄送
-                                        <#elseif customer.sendStatus == 3>
-                                            已收货
-                                        </#if></font>
+                                        <font color=#06c>
+                                            <#if customer.sendStatus??>
+                                                <#if customer.sendStatus == 1>
+                                                    未寄送
+                                                <#elseif customer.sendStatus == 2>
+                                                    已寄送
+                                                <#elseif customer.sendStatus == 3>
+                                                    已收货
+                                                </#if>
+                                            </#if>
+                                        </font>
                                     </a>
                                     )
                                 <#elseif customer.customerIsSolve == 6>
                                     退货(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateBookGoods(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.backStatus == 1>
-                                            未寄回
-                                        <#elseif customer.backStatus == 2>
-                                            已寄回
-                                        <#elseif customer.backStatus == 3>
-                                            已收货
-                                        </#if></font>
+                                        <font color=#06c>
+                                            <#if customer.backStatus??>
+                                                <#if customer.backStatus == 1>
+                                                    未寄回
+                                                <#elseif customer.backStatus == 2>
+                                                    已寄回
+                                                <#elseif customer.backStatus == 3>
+                                                    已收货
+                                                </#if>
+                                            </#if>
+                                        </font>
                                     </a>
                                     )
                                 <#elseif customer.customerIsSolve == 7>
                                     无理由退货(
                                     <a style="text-decoration:none" href="javascript:void(0);" onclick="toUpdateNoreasonBack(${customer.customerId!''})">
-                                        <font color=#06c><#if customer.backStatus == 1>
-                                            未寄回
-                                        <#elseif customer.backStatus == 2>
-                                            已寄回
-                                        <#elseif customer.backStatus == 3>
-                                            已收货
-                                        </#if></font>
+                                        <font color=#06c>
+                                            <#if customer.backStatus??>
+                                                <#if customer.backStatus == 1>
+                                                    未寄回
+                                                <#elseif customer.backStatus == 2>
+                                                    已寄回
+                                                <#elseif customer.backStatus == 3>
+                                                    已收货
+                                                </#if>
+                                            </#if>
+                                        </font>
                                     </a>
                                     )
                                 </#if>

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

@@ -57,28 +57,16 @@
 <div class="page-container">
     <div class="text-c">
         <form action="${path}/admin/salesOrder/list_order_page" method="post">
-            <#--Efast add begin-->
-                <#--<select class="my-select" name="customerIsVisit" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;">
-                    <option value ="">是否需要回访</option>
-                    <option value="">是否回访</option>
-                    <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;margin-bottom: 10px;">
                     <option value ="">是否已导出过</option>
-                    <#--<option value ="1">是</option>
-                    <option value ="2">否</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;margin-bottom: 10px;">
                     <option value ="">是否已发货</option>
-                    <#--<option value ="1">是</option>
-                    <option value ="2">否</option>-->
                     <option value ="1" <#if salesOrder.isDeliverGoods??><#if salesOrder.isDeliverGoods == "1" >selected="selected"</#if></#if>>是</option>
                     <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="salesStoreId" id="salesStoreId" class="select" style="height: 36px;width: 120px;margin: 0px;margin-bottom: 10px;"">
                 <option value="">店铺</option>
                     <#if listStoreInfo?? &&  (listStoreInfo?size > 0) >
@@ -86,42 +74,7 @@
                             <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>
-                    <option value="17" <#if salesOrder.storeName??><#if salesOrder.storeName == "17" >selected="selected"</#if></#if>>物道团购</option>
-                    <option value="18" <#if salesOrder.storeName??><#if salesOrder.storeName == "18" >selected="selected"</#if></#if>>年糕妈妈</option>
-                    <option value="19" <#if salesOrder.storeName??><#if salesOrder.storeName == "19" >selected="selected"</#if></#if>>快抱团</option>
-                    <option value="20" <#if salesOrder.storeName??><#if salesOrder.storeName == "20" >selected="selected"</#if></#if>>北京北斗</option>
-                    <option value="21" <#if salesOrder.storeName??><#if salesOrder.storeName == "21" >selected="selected"</#if></#if>>凯叔</option>
-                    <option value="22" <#if salesOrder.storeName??><#if salesOrder.storeName == "22" >selected="selected"</#if></#if>>上海-崔玉涛育学园</option>
-                    <option value="23" <#if salesOrder.storeName??><#if salesOrder.storeName == "23" >selected="selected"</#if></#if>>简二家</option>
-                    <option value="24" <#if salesOrder.storeName??><#if salesOrder.storeName == "24" >selected="selected"</#if></#if>>科学育儿</option>
-                    <option value="25" <#if salesOrder.storeName??><#if salesOrder.storeName == "25" >selected="selected"</#if></#if>>美康辰</option>
-                    <option value="26" <#if salesOrder.storeName??><#if salesOrder.storeName == "26" >selected="selected"</#if></#if>>北京悦祺</option>
-                    <option value="27" <#if salesOrder.storeName??><#if salesOrder.storeName == "27" >selected="selected"</#if></#if>>上海淘宝</option>
-                    <option value="28" <#if salesOrder.storeName??><#if salesOrder.storeName == "28" >selected="selected"</#if></#if>>蓝极风</option>
-                    <option value="29" <#if salesOrder.storeName??><#if salesOrder.storeName == "29" >selected="selected"</#if></#if>>小莉团购</option>
-                    <option value="30" <#if salesOrder.storeName??><#if salesOrder.storeName == "30" >selected="selected"</#if></#if>>超级妈咪团</option>
-                    <option value="31" <#if salesOrder.storeName??><#if salesOrder.storeName == "31" >selected="selected"</#if></#if>>艾德叔叔</option>
-                    <option value="32" <#if salesOrder.storeName??><#if salesOrder.storeName == "32" >selected="selected"</#if></#if>>钱儿频道</option>
-                    <option value="33" <#if salesOrder.storeName??><#if salesOrder.storeName == "33" >selected="selected"</#if></#if>>尹建莉</option>
-                    <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>-->
                 </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;">
-                <span class="select-box">
-                        <select name="cooperativeState" class="select">
-                            <option value="1">是</option>
-                            <option value="2">否</option>
-                        </select>
-                </span>
-                </div>-->
             <#--Efast add end-->
             <input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesOrderId!}" placeholder="百胜订单号" name="salesOrderId" id="salesOrderId">
             <input type="text" class="my-input"  style="width:80px;margin-right: 0px;" value="${salesOrder.salesAddressName!}" placeholder="收货人姓名" name="salesAddressName" id="salesAddressName">
@@ -135,8 +88,6 @@
             <button onClick="upFiles();" class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i>上传第三方平台订单</button>
             <button onClick="upFiles2();"  class="btn radius" style="background: #32a3d8;color: #fff; height: 35px" type="button"><i class="Hui-iconfont">&#xe632;</i>上传发货信息</button>
             <button onClick="downloadOrder();" class="btn radius" style="background: #32a3d8;color: #fff;" type="button" title="下载第三方平台的发货信息"><i class="Hui-iconfont">&#xe640;</i> 下载发货后订单</button>
-
-            </div>
         </form>
     </div>