ngz

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-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 {