修改客户信息

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

@@ -485,7 +485,7 @@ public class AdminSalesOrderController {
             row.createCell(10).setCellValue(payType);
             row.createCell(11).setCellValue(order.getSalesDealCode());
             row.createCell(12).setCellValue(order.getSalesPayTime()==null?"":format.format(order.getSalesPayTime()));
-            row.createCell(13).setCellValue("EMS");
+            row.createCell(13).setCellValue(order.getSalesPostFirm()==null?"":order.getSalesPostFirm());
             row.createCell(14).setCellValue("");
             row.createCell(15).setCellValue("");
             row.createCell(16).setCellValue(order.getSalesAdminRemark() == null ? "":order.getSalesAdminRemark());

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

@@ -1056,8 +1056,8 @@ public class AdminOrderController {
                 salesOrder.setSalesStatus(1);
                 salesOrder.setSalesSendType(2);
                 salesOrder.setSalesSalesTime(date);
-                //salesOrder.setSalesAddressInfo(province_name+" "+city_name+" "+district_name+" "+address);
-                salesOrder.setSalesAddressInfo(efastOrder.getOrderAddress());
+                salesOrder.setSalesAddressInfo(efastOrder.getOrderProvince()+" "+efastOrder.getOrderCity()+" "+efastOrder.getOrderArea()+" "+efastOrder.getOrderAddress());
+                //salesOrder.setSalesAddressInfo(efastOrder.getOrderAddress());
                 salesOrder.setSalesAddressTel(efastOrder.getOrderAddressTel());
                 salesOrder.setSalesAddressName(efastOrder.getOrderAddressName());
                 salesOrder.setSalesAmount(efastOrder.getOrderAmount());

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

@@ -780,7 +780,7 @@ public class ExcelUtil {
     }
 
     public static void main(String[] args) throws IOException {
-        String[] add = splitAddress("新疆维吾尔自治区乌鲁木齐市沙依巴克镇农大东路311号新疆农业大学外国语学院(830002).");
+        String[] add = splitAddress("北京 西城区   兴盛街2号华荣公寓A401");
         if (add == null) {
             System.out.println("切割失败...");
         }

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

@@ -76,7 +76,7 @@
                     <#--<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 == "2" >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="efastStoreName" id="efastStoreName" class="select" style="height: 36px;width: 120px;margin: 0px;padding: 12px 10px 6px 15px;margin-bottom: 10px;"">