系统优化

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

@@ -392,6 +392,7 @@
         from tb_rst_sales_order_info
         LEFT JOIN tb_rst_sales_order_item oi ON tb_rst_sales_order_info.sales_id = oi.item_order_id
         <where>
+            sales_status != 3
             <if test="salesIsDownload !=null and salesIsDownload !=''">
                 AND sales_is_download = #{salesIsDownload}
             </if>

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

@@ -592,7 +592,7 @@ public class AdminCustomerController {
 
         CustomerInfo ci = (CustomerInfo) map.get("customer");
         if(ci != null){
-            if(ci.getCustomerProvinceId() != null && "".equals(ci.getCustomerProvinceId())){
+            if(ci.getCustomerProvinceId() != null && !"".equals(ci.getCustomerProvinceId())){
                 Province province = new Province();
                 province.setProvinceId(Integer.valueOf(ci.getCustomerProvinceId()));
                 List<Province> provinceList = addressService.listProvince(province);
@@ -601,7 +601,7 @@ public class AdminCustomerController {
                 ci.setCustomerProvinceName("");
             }
 
-            if(ci.getCustomerCityId() != null && "".equals(ci.getCustomerCityId())){
+            if(ci.getCustomerCityId() != null && !"".equals(ci.getCustomerCityId())){
                 City city = new City();
                 city.setCityId(Integer.valueOf(ci.getCustomerCityId()));
                 List<City>  cityList = addressService.listCity(city);
@@ -610,7 +610,7 @@ public class AdminCustomerController {
                 ci.setCustomerCityName("");
             }
 
-            if(ci.getCustomerDistrictId() != null && "".equals(ci.getCustomerDistrictId())){
+            if(ci.getCustomerDistrictId() != null && !"".equals(ci.getCustomerDistrictId())){
                 District district = new District();
                 district.setDistrictId(Integer.valueOf(ci.getCustomerDistrictId()));
                 List<District> districtList = addressService.listDistrict(district);

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

@@ -821,8 +821,12 @@ public class AdminOrderController {
                     row.add(strarray[1]);
                 }
                 row.add(salesOrder.getSalesAddressInfo() == null ? null:salesOrder.getSalesAddressInfo());
-                String frim = replace(salesOrder.getSalesPostFirm());
-                row.add(frim);
+                if(salesOrder.getSalesPostFirm() != null){
+                    String frim = replace(salesOrder.getSalesPostFirm());
+                    row.add(frim);
+                }else{
+                    row.add(null);
+                }
                 row.add(salesOrder.getSalesPostNum() == null ? null:salesOrder.getSalesPostNum());
                 row.add(salesOrder.getItemProductName() == null ? null:salesOrder.getItemProductName()+(salesOrder.getItemProductColor() == null ? null:"-"+salesOrder.getItemProductColor()));
                 //row.add(salesOrder.getItemProductColor() == null ? null:salesOrder.getItemProductColor());
@@ -833,6 +837,8 @@ public class AdminOrderController {
                 if(salesOrder.getSalesDistributionTime() == null){
                     if(salesOrder.getSalesSendTime() != null){
                         row.add(formatter.format(salesOrder.getSalesSendTime()));
+                    }else{
+                        row.add(null);
                     }
                 }else{
                     row.add(formatter.format(salesOrder.getSalesDistributionTime()));

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

@@ -59,9 +59,9 @@
         </div>
         <div <#if procMethod.procMethodIsBack == 1>class="tabCon"</#if> style="display: none;">
             <div class="row cl">
-                <div class="formControls col-2 col-sm-2 text-r">
+                <#--<div class="formControls col-2 col-sm-2 text-r">
                     <strong>寄回信息</strong>
-                </div>
+                </div>-->
                 <div class="formControls col-10 col-sm-10">
                     <table class="table table-border table-bg table-bordered" >
                         <thead>
@@ -343,9 +343,9 @@
                 </div>
             </div>
             <div class="row cl" id="postageInformation" style="display: none;">
-                <div class="formControls col-2 col-sm-2 text-r">
+                <#--<div class="formControls col-2 col-sm-2 text-r">
                     <strong>邮费信息</strong>
-                </div>
+                </div>-->
                 <div class="formControls col-10 col-sm-10">
                 <table class="table table-border table-bg table-bordered" >
                     <thead>
@@ -638,9 +638,9 @@
 
         <div <#if procMethod.procMethodIsBack == 1>class="tabCon"</#if>style="display: none;">
                 <div class="row cl" id="informationInformation">
-                    <div class="formControls col-2 col-sm-2 text-r">
+                    <#--<div class="formControls col-2 col-sm-2 text-r">
                         <strong>收费信息</strong>
-                    </div>
+                    </div>-->
                     <div class="formControls col-10 col-sm-10">
                         <table class="table table-border table-bg table-bordered" >
                             <thead>

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

@@ -155,7 +155,9 @@
                         <#--<th>产品图片</th>-->
                         <th>产品市场价（￥）</th>
                         <th>产品折扣价（￥）</th>
-                        <th>产品数量</th>
+                        <th>未退货数量</th>
+                        <th>已退货数量</th>
+                        <th>产品总数</th>
                     </tr>
                     <#if order.salesOrderItemList?? &&  (order.salesOrderItemList?size > 0) >
                         <#list order.salesOrderItemList as item>
@@ -165,6 +167,8 @@
                                 <#--<td>${item.itemProductPic!''}</td>-->
                                 <td>${item.itemProductPrice/100!''}</td>
                                 <td>${item.itemProductDiscount/100!''}</td>
+                                <td>${item.itemNum-item.itemReturnNum}</td>
+                                <td>${item.itemReturnNum}</td>
                                 <td>${item.itemNum}</td>
                             </tr>
                         </#list>

watero-rst-web/src/main/webapp/common/js/salesOrder/salesOrder.js

@@ -144,7 +144,9 @@ function setSelectCustomer(customerId){
                  ulc.setUlcById(0,customer.customerProvinceId,customer.customerCityId,customer.customerDistrictId);
                 $("#addressDesc").html(customer.customerSendAddress);
                 $("#salesAddressInfo").val(customer.customerSendAddress);
-                setSelectProduct(data.returnMsg.colorIds);
+                if(data.returnMsg.colorIds != null){
+                    setSelectProduct(data.returnMsg.colorIds);
+                }
             }else{
             }
             $("#salesCustomer").show();