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

watero-rent-web/src/main/java/com/iamberry/rent/handlers/pay/RentPayHandler.java

@@ -149,11 +149,11 @@ public class RentPayHandler {
 					//推送消息到微信
 					try {
 						sendMessageUtil.probationPaySuccess(
-								ResultInfo.PAYSUCCESS, 
-								order.getRentPayMoney()/100 + "元", 
-								productName, 
-								ResultInfo.PAYSUCCESSFOOT, 
-								order.getRentOpenid(), 
+								ResultInfo.PAYSUCCESS,
+								order.getRentPayMoney()/100 + "元",
+								productName,
+								ResultInfo.PAYSUCCESSFOOT,
+								order.getRentOpenid(),
 								ResultInfo.RENT_ORDER_DETAIL);
 					} catch (Exception e) {
 						System.out.println("推送支付成功消息失败!");

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

@@ -112,6 +112,8 @@
     <where>
       <if test="customerName != null and customerName != ''">
         c.customer_name like CONCAT('%',#{customerName},'%')
+        OR
+        c.customer_wechat_name like CONCAT('%',#{customerName},'%')
       </if>
       <if test="customerIsSolve != null">
         AND c.customer_is_solve = #{customerIsSolve}

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

@@ -133,7 +133,7 @@
                     </div>-->
                 </div>
             </div>
-            <div class="row cl" id="salesChannelsSelect" style="display: none">
+            <div class="row cl" id="salesChannelsSelect">
                 <input type="hidden" id="companyId" name="companyId" value="" >
                 <input type="hidden" id="storeId" name="storeId" value="" >
                 <label class="form-label col-1 col-sm-1">销售渠道：</label>
@@ -443,12 +443,7 @@
                     </script>-->
                 </div>
             </div>
-             <div class="row cl" id="customerDescDiv">
-                 <label class="form-label col-1 col-sm-1">备注：</label>
-                 <div class="col-2 col-sm-2 col-offset-3">
-                      <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 540px;height: 100px;margin-left: -279px;"></textarea>
-                 </div>
-             </div>
+
             <div class="row cl" id="sendAddressByPhone" style="display: none;">
                 <label class="form-label col-1 col-sm-1"></label>
                 <div class="formControls col-2 col-sm-2">
@@ -461,7 +456,12 @@
                     <div id="m-msg" style="color: #e00"></div>
                 </div>
             </div>
-
+             <div class="row cl" id="customerDescDiv">
+                 <label class="form-label col-1 col-sm-1">备注：</label>
+                 <div class="col-5 col-sm-5">
+                     <textarea type="text" placeholder="" id="customerDesc" name="customerDesc" style="width: 540px;height: 100px;"></textarea>
+                 </div>
+              </div>
             <div class="row cl" id="updateProduct" style="display: none;">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>更换产品：</label>
                 <div class="formControls col-9 col-sm-9" >

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

@@ -143,12 +143,7 @@
                                     </#if>
                                 </#if>
                             </td>
-
-                            <#if (customer.customerTel)?? && customer.customerTel?length gt 7>
-                                <td>${customer.customerTel?substring(0,3)}***${customer.customerTel?substring(customer.customerTel?length-4,customer.customerTel?length)}</td>
-                            <#else>
-                                <td>${customer.customerTel!''}</td>
-                            </#if>
+                            <td>${customer.customerTel!''}</td>
                             <td>
                                 <#if customer.customerSourceType == 1>
                                     400电话

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/addRenovationMachine.ftl

@@ -220,8 +220,8 @@
             layer.msg("数量长度为2-10位",{icon: 5,time:3000});
             return false;
         }
-        if( number > 100){
-            layer.msg("每次最高生产数量为100",{icon: 5,time:3000});
+        if( number > 500){
+            layer.msg("每次最高生产数量为500",{icon: 5,time:3000});
             return false;
         }
         return true;

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

@@ -501,7 +501,7 @@ function initProcessResult(type){
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
 
-                $("#salesChannelsSelect").hide();  //屏蔽销售公司
+                //$("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             case 4: //维修
                 result = isSolve.maintain;
@@ -522,7 +522,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();//维修产品
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
-                $("#salesChannelsSelect").hide();  //屏蔽销售公司
+                //$("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             case 5://补发
                 result = isSolve.reissue;
@@ -564,7 +564,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
-                $("#salesChannelsSelect").hide();  //屏蔽销售公司
+                //$("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             case 7://无理由退货
                 result = isSolve.noReasonBack;
@@ -585,7 +585,7 @@ function initProcessResult(type){
                 $("#updateProduct").hide();
                 $("#postageAccount").show();    //邮费转账账户
                 visitByType(2); //需要回访
-                $("#salesChannelsSelect").hide();  //屏蔽销售公司
+                //$("#salesChannelsSelect").hide();  //屏蔽销售公司
                 break;
             default:
                 break;

watero-wechat-web/src/main/webapp/common/shop/js/page/order_details.js

@@ -109,22 +109,74 @@ mui
                                 && bannerdata.salesPostFirm != ''
                                 && bannerdata.salesPostNum != null
                                 && bannerdata.salesPostNum != '') {
-                                if (bannerdata.salesPostFirm == 'shentong') {
+                                if (bannerdata.salesPostFirm == 'sto') {
                                     $('#salesPostFirm')
                                         .html('申通快递')
                                 }
-                                if (bannerdata.salesPostFirm == 'yuantong') {
+                                if (bannerdata.salesPostFirm == 'yto') {
                                     $('#salesPostFirm')
                                         .html('圆通快递')
                                 }
-                                if (bannerdata.salesPostFirm == 'shunfeng') {
+                                if (bannerdata.salesPostFirm == 'sf') {
                                     $('#salesPostFirm')
                                         .html('顺丰快递')
                                 }
+                                if (bannerdata.salesPostFirm == 'ems') {
+                                    $('#salesPostFirm')
+                                        .html('邮政EMS')
+                                }
+                                if (bannerdata.salesPostFirm == 'zto') {
+                                    $('#salesPostFirm')
+                                        .html('中通快递')
+                                }
+                                if (bannerdata.salesPostFirm == 'zjs') {
+                                    $('#salesPostFirm')
+                                        .html('宅急送')
+                                }
+                                if (bannerdata.salesPostFirm == 'yunda') {
+                                    $('#salesPostFirm')
+                                        .html('韵达快递')
+                                }
+                                if (bannerdata.salesPostFirm == 'cces') {
+                                    $('#salesPostFirm')
+                                        .html('cces快递')
+                                }
+                                if (bannerdata.salesPostFirm == 'pick') {
+                                    $('#salesPostFirm')
+                                        .html('上门提货')
+                                }
+                                if (bannerdata.salesPostFirm == 'htky') {
+                                    $('#salesPostFirm')
+                                        .html('汇通快递')
+                                }
+                                if (bannerdata.salesPostFirm == 'ttkdex') {
+                                    $('#salesPostFirm')
+                                        .html('天天快递')
+                                }
+                                if (bannerdata.salesPostFirm == 'stars') {
+                                    $('#salesPostFirm')
+                                        .html('星晨急便')
+                                }
+                                if (bannerdata.salesPostFirm == 'jd') {
+                                    $('#salesPostFirm')
+                                        .html('京东快递')
+                                }
+                                if (bannerdata.salesPostFirm == '01') {
+                                    $('#salesPostFirm')
+                                        .html('其他')
+                                }
+                                if (bannerdata.salesPostFirm == '02') {
+                                    $('#salesPostFirm')
+                                        .html('上门送货')
+                                }
                                 if (bannerdata.salesPostFirm == 'longbanwuliu') {
                                     $('#salesPostFirm')
                                         .html('龙邦快递')
                                 }
+                                if (bannerdata.salesPostFirm == 'dbkd') {
+                                    $('#salesPostFirm')
+                                        .html('德邦快递')
+                                }
                                 $('#salesPostNum').html(
                                     bannerdata.salesPostNum)
                             } else {

watero-wechat-web/src/main/webapp/common/shop/js/page/order_list.js

@@ -176,18 +176,57 @@ function pullupRefresh() {
                             }
                         });
                         this.salesPostFirm == null ? this.salesPostFirm = "" : this.salesPostFirm;
-                        if(this.salesPostFirm == 'shentong') {
+                        if(this.salesPostFirm == 'sto') {
                             this.salesPostFirm = '申通快递';
                         }
-                        if(this.salesPostFirm == 'yuantong') {
+                        if(this.salesPostFirm == 'yto') {
                             this.salesPostFirm = '圆通快递';
                         }
-                        if(this.salesPostFirm == 'shunfeng') {
+                        if(this.salesPostFirm == 'sf') {
                             this.salesPostFirm = '顺丰快递';
                         }
+                        if(this.salesPostFirm == 'zto') {
+                            this.salesPostFirm = '中通速递';
+                        }
+                        if(this.salesPostFirm == 'ems') {
+                            this.salesPostFirm = '邮政EMS';
+                        }
+                        if(this.salesPostFirm == 'zjs') {
+                            this.salesPostFirm = '宅急送';
+                        }
+                        if(this.salesPostFirm == 'yunda') {
+                            this.salesPostFirm = '韵达快递';
+                        }
+                        if(this.salesPostFirm == 'cces') {
+                            this.salesPostFirm = 'cces快递';
+                        }
+                        if(this.salesPostFirm == 'pick') {
+                            this.salesPostFirm = '上门提货';
+                        }
+                        if(this.salesPostFirm == 'htky') {
+                            this.salesPostFirm = '汇通快递';
+                        }
+                        if(this.salesPostFirm == 'ttkdex') {
+                            this.salesPostFirm = '天天快递';
+                        }
+                        if(this.salesPostFirm == 'stars') {
+                            this.salesPostFirm = '星晨急便';
+                        }
+                        if(this.salesPostFirm == 'jd') {
+                            this.salesPostFirm = '京东快递';
+                        }
+                        if(this.salesPostFirm == '01') {
+                            this.salesPostFirm = '其他';
+                        }
+                        if(this.salesPostFirm == '02') {
+                            this.salesPostFirm = '上门送货';
+                        }
                         if(this.salesPostFirm == 'longbanwuliu') {
                             this.salesPostFirm = '龙邦快递';
                         }
+                        if(this.salesPostFirm == 'dbkd') {
+                            this.salesPostFirm = '德邦快递';
+                        }
                         if(this.salesPostNum == null || this.salesPostNum == "") {
                             this.salesPostNum = ""
                         } else {