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

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -93,6 +93,15 @@ public class SalesOrder implements Serializable {
     //Efast升级新增字段 2018-6-6
     private String isHaveImport;//是否已导出过
     private String isDeliverGoods;//是否已发货
+    private String styleColor;//上传订单结果颜色
+
+    public String getStyleColor() {
+        return styleColor;
+    }
+
+    public void setStyleColor(String styleColor) {
+        this.styleColor = styleColor;
+    }
 
     public String getIsHaveImport() {
         return isHaveImport;

watero-rst-core/src/main/java/com.iamberry.rst.core/order/EfastOrder.java

@@ -53,6 +53,16 @@ public class EfastOrder implements Serializable{
     private String returnMsg;
     private String platformOrderId;         //平台订单号， 用于推送efast时  导出物流信息
 
+    private String styleColor;//订单上传后颜色显示
+
+    public String getStyleColor() {
+        return styleColor;
+    }
+
+    public void setStyleColor(String styleColor) {
+        this.styleColor = styleColor;
+    }
+
     public List<EfastOrderItem> getItemList() {
         return itemList;
     }

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

@@ -1084,6 +1084,7 @@ public class AdminOrderController {
                 salesOrder.setSalesIsLocked(0);
                 salesOrder.setSalesIsSeparate(0);
                 salesOrder.setSalesIsDownload(1);
+                salesOrder.setSalesPostFirm(postType);
                 salesOrder.setSalesOrderItemList(salesOrderItemList);
                 salesOrderList.add(salesOrder);
                 mapsalesOrderList.put(orderId, salesOrder);
@@ -1118,15 +1119,21 @@ public class AdminOrderController {
         }
         StringBuffer sb = new StringBuffer();
          for(SalesOrder salesOrders: mapsalesOrderList.values()){
-                orderService.updateSalesOrderPostType(salesOrders,postType);
+                //orderService.updateSalesOrderPostType(salesOrders,postType);
                 bl = salesOrderService.addRstOrderAndIteminfo(salesOrders);
                 logger.info("EFAST升级合并订单项调用boolean值+："+bl);
-               /* return new ResponseJson(200, "SUCCESS", 200)
-                        .addResponseKeyValue("errorPath", request.getContextPath() + filePath)
-                        .addResponseKeyValue("order_list", salesOrderList);*/
+               String salesDealCode = salesOrders.getSalesDealCode();
                if(bl == false){
+                   for(EfastOrder efastOrderStyle:orderEfasts){
+                       if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
+                       efastOrderStyle.setStyleColor("color:red;");
+                   }
                    newFaultNum ++;
                }else{
+                   for(EfastOrder efastOrderStyle:orderEfasts){
+                       if(salesDealCode.equals(efastOrderStyle.getPlatformOrderId()))
+                           efastOrderStyle.setStyleColor("color:black;");
+                   }
                    sb.append(salesOrders.getSalesDealCode()+"\r\n");
                }
          }

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -174,13 +174,13 @@ public class ExcelUtil {
             }
             i++;
 
-            /*if(number > maxNuber+1){
+            if(number > maxNuber+1){
                 return false;
             }
 
             if(i > maxNuber+1){
                 break;
-            }*/
+            }
         }
         return true;
     }

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

@@ -81,32 +81,32 @@
                 <#--<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.isHaveImport??><#if salesOrder.storeName == "4" >selected="selected"</#if></#if>>微商/代理商</option>
-                    <option value="11" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "11" >selected="selected"</#if></#if>>微信平台商</option>
-                    <option value="13" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "13" >selected="selected"</#if></#if>>上海零售</option>
-                    <option value="15" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "15" >selected="selected"</#if></#if>>小小包 </option>
-                    <option value="16" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "16" >selected="selected"</#if></#if>>伊姐团购</option>
-                    <option value="17" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "17" >selected="selected"</#if></#if>>物道团购</option>
-                    <option value="18" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "18" >selected="selected"</#if></#if>>年糕妈妈</option>
-                    <option value="19" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "19" >selected="selected"</#if></#if>>快抱团</option>
-                    <option value="20" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "20" >selected="selected"</#if></#if>>北京北斗</option>
-                    <option value="21" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "21" >selected="selected"</#if></#if>>凯叔</option>
-                    <option value="22" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "22" >selected="selected"</#if></#if>>上海-崔玉涛育学园</option>
-                    <option value="23" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "23" >selected="selected"</#if></#if>>简二家</option>
-                    <option value="24" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "24" >selected="selected"</#if></#if>>科学育儿</option>
-                    <option value="25" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "25" >selected="selected"</#if></#if>>美康辰</option>
-                    <option value="26" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "26" >selected="selected"</#if></#if>>北京悦祺</option>
-                    <option value="27" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "27" >selected="selected"</#if></#if>>上海淘宝</option>
-                    <option value="28" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "28" >selected="selected"</#if></#if>>蓝极风</option>
-                    <option value="29" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "29" >selected="selected"</#if></#if>>小莉团购</option>
-                    <option value="30" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "30" >selected="selected"</#if></#if>>超级妈咪团</option>
-                    <option value="31" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "31" >selected="selected"</#if></#if>>艾德叔叔</option>
-                    <option value="32" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "32" >selected="selected"</#if></#if>>钱儿频道</option>
-                    <option value="33" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "33" >selected="selected"</#if></#if>>尹建莉</option>
-                    <option value="34" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "34" >selected="selected"</#if></#if>>老虎工作室</option>
-                    <option value="35" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "35" >selected="selected"</#if></#if>>有赞</option>
-                    <option value="37" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "37" >selected="selected"</#if></#if>>深圳鑫之鹏</option>
-                    <option value="38" <#if salesOrder.isHaveImport??><#if salesOrder.storeName == "38" >selected="selected"</#if></#if>>东西儿童教育</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>
+                    <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;">
@@ -390,7 +390,7 @@
     $('#order_excel').click(function (e) {
        var isHaveImport = $("#isHaveImport").val();
        var isDeliverGoods = $("#isDeliverGoods").val();
-       var storeName = $("#storeName").val();
+       var storeName = $("#efastStoreName").val();
        var startDate = $("#startDate").val();
        var endDate = $("#endDate").val();
         window.location="${path}/admin/salesOrder/download_efast_order?isHaveImport="+isHaveImport+"&isDeliverGoods="+isDeliverGoods+"&storeName="+storeName+"&startDate="+startDate+"&endDate="+endDate;

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

@@ -205,7 +205,7 @@
     });
 
     /* 获取 */
-    $(function(){
+    /*$(function(){
         $.ajax({
             cache: true,
             type: "POST",
@@ -227,7 +227,7 @@
             error: function(XmlHttpRequest, textStatus, errorThrown){
             }
         })
-    })
+    })*/
 
 
     // 对话框 - 推送结果
@@ -364,11 +364,13 @@
                 for (var i = 0; i < list.length; i++) {
                     var order = list[i];
                     // 推送失败 展示 颜色
-                    var style = '';
-                    if (order.returnStatus != 'SUCCESS') {
+                    var style = order.styleColor;
+                    /*if (order.returnStatus != 'SUCCESS') {
                         style = 'color:red;';
                         faultNum ++;
-                    }
+                    }else{
+                        style = 'color:black;';
+                    }*/
                     $body.append('<tr class="text-c">'+
                             '<td style="' + style + '">' + order.orderAddressName + '</td>'+
                             '<td style="' + style + '">' + order.orderAddressTel + '</td>'+