收费信息添加交易图片

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

@@ -1156,7 +1156,18 @@ public class AdminOrderController {
                 salesOrder.setSalesStatus(0);
                 salesOrder.setSalesSendType(2);
                 salesOrder.setSalesSalesTime(date);
-                salesOrder.setSalesAddressInfo(efastOrder.getOrderProvince()+" "+efastOrder.getOrderCity()+" "+efastOrder.getOrderArea()+" "+efastOrder.getOrderAddress());
+                String area = efastOrder.getOrderArea();
+                String myaddress = efastOrder.getOrderAddress();
+                try{
+                    if(myaddress.indexOf(area)>-1){
+                        myaddress = myaddress.substring(myaddress.indexOf(area)+area.length(),myaddress.length());
+                    }
+                }catch (Exception e){
+                    e.printStackTrace();
+                }
+
+                salesOrder.setSalesAddressInfo(efastOrder.getOrderProvince()+" "+efastOrder.getOrderCity()+" "+efastOrder.getOrderArea()+" "+myaddress);
+
                 salesOrder.setSalesAddressTel(efastOrder.getOrderAddressTel());
                 salesOrder.setSalesAddressName(efastOrder.getOrderAddressName());
                 salesOrder.setSalesAmount(efastOrder.getOrderAmount());

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

@@ -94,7 +94,7 @@
 
                         <div class="addr-pcd" style="float: left;">
                             市:
-                            <select class="my-select " name="addr-info" id="addr-city" matchSelect="市" style="height: 30px;width: 180px;margin: 0px;">
+                            <select class="my-select " name="addr-info" id="addr-city" matchSelect="市|区市" style="height: 30px;width: 180px;margin: 0px;">
                             <#list heads as head>
                                 <option value="${head}" >${head}</option>
                             </#list>
@@ -103,7 +103,7 @@
 
                         <div class="addr-pcd" style="float: left;">
                             区:
-                            <select class="my-select " name="addr-info" id="addr-district" matchSelect="区|县" style="height: 30px;width: 180px;margin: 0px;">
+                            <select class="my-select " name="addr-info" id="addr-district" matchSelect="区|县|区县" style="height: 30px;width: 180px;margin: 0px;">
                             <#list heads as head>
                                 <option value="${head}" >${head}</option>
                             </#list>
@@ -324,10 +324,18 @@
         $("#order_store_info").change(function (){
             var orderStoreInfo = $("#order_store_info").val();
             getStore(orderStoreInfo);
-        })
+        });
 
         /*初始化选中选项*/
         initSelect();
+        /*如果省市区都为同样的选中项，那么默认无地址*/
+        var myProvince = $("#addr-province").val();
+        var myCity = $("#addr-city").val();
+        var myDistrict = $("#addr-district").val();
+        if(myProvince == myCity && myCity == myDistrict){
+            $("#cityInfo-2").attr("checked","checked");
+            $(".addr-pcd").hide();
+        }
 
         /*初始化单选框样式*/
         $('.skin-minimal input').iCheck({
@@ -373,7 +381,7 @@
                         wValue = temValue;
                         wFlag = temFlag
                     }
-                })
+                });
                 currentSelect.val(wValue);
             }
         })
@@ -398,11 +406,16 @@
             } else {
                 $("#tbody").html("");
                 for (var i = 0; i < result.returnMsg.values.length; i++) {
-                    var temp = '<tr class="text-c" ><td style="width: 50px;">' + result.returnMsg.values[i] + '</td><td>';
-                    temp += '<table class="table table-border table-bordered table-bg">';
+                    var backgroun = '';
+                    if(i%2!=0){
+                        backgroun = 'background: #F5FAFE';
+                    }
+
+                    var temp = '<tr class="text-c" style="'+ backgroun +'"><td style="width: 50px;">' + result.returnMsg.values[i] + '</td><td>';
+                    temp += '<table class="table table-border table-bordered table-bg" style="'+ backgroun +'">';
 
                     for (var j = 0; j < result.returnMsg.colors.length; j=j+6) {
-                        temp += '<tr >';
+                        temp += '<tr>';
                         temp = temp + '<td style="text-align: left;padding: 3px;"><label style="font-size: 12px;"><input checked class="productmap" type="radio" name="color_'+ i + '" value="' + result.returnMsg.colors[j].colorBar + '_' + result.returnMsg.values[i] + '"/>' + result.returnMsg.colors[j].productName + '-' + result.returnMsg.colors[j].colorName + '（' + result.returnMsg.colors[j].colorBar + '）</label></td>';
                         if( typeof (result.returnMsg.colors[j+1]) != 'undefined'){
                             temp = temp + '<td style="text-align: left;padding: 3px;"><label style="font-size: 12px;"><input checked class="productmap" type="radio" name="color_'+ i + '" value="' + result.returnMsg.colors[j+1].colorBar + '_' + result.returnMsg.values[i] + '"/>' + result.returnMsg.colors[j+1].productName + '-' + result.returnMsg.colors[j+1].colorName + '（' + result.returnMsg.colors[j+1].colorBar + '）</label></td>';