فهرست منبع

修改bug文档bug

liujiankang 7 سال پیش
والد
کامیت
65794c2b99

+ 6 - 5
watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -1225,8 +1225,8 @@ public class CustomerServiceImpl implements CustomerService {
                             if (reissue.getCustomerId().intValue() == customer.getCustomerId()) {
                                 customer.setSendStatus(reissue.getReissueSendStatus());
                                 customer.setSalesTime(reissue.getSalesPayTime());
-                                customer.setBackLogisticsNo(reissue.getReissueSendLogisticsNo());
-                                customer.setBackLogisticsCompany(reissue.getReissueSendLogisticsCompany());
+                                customer.setSendLogisticsNo(reissue.getReissueSendLogisticsNo());
+                                customer.setSendLogisticsCompany(reissue.getReissueSendLogisticsCompany());
                                 break;
                             }
                         }
@@ -1236,7 +1236,8 @@ public class CustomerServiceImpl implements CustomerService {
                             if (backGoods.getCustomerId().intValue() == customer.getCustomerId()) {
                                 customer.setBackStatus(backGoods.getBackGoodsBackStatus());
                                 customer.setSalesTime(backGoods.getSalesPayTime());
-                                customer.setSendLogisticsNo(backGoods.getBackGoodsBackLogisticsNo());
+                                customer.setBackLogisticsNo(backGoods.getBackGoodsBackLogisticsNo());
+                                customer.setBackLogisticsCompany(backGoods.getBackGoodsBackLogisticsCompany());
                                 break;
                             }
                         }
@@ -1246,8 +1247,8 @@ public class CustomerServiceImpl implements CustomerService {
                             if (noreasonBack.getCustomerId().intValue() == customer.getCustomerId()) {
                                 customer.setBackStatus(noreasonBack.getNoreasonBackBackStatus());
                                 customer.setSalesTime(noreasonBack.getSalesPayTime());
-                                customer.setSendLogisticsNo(noreasonBack.getNoreasonBackBackLogisticsNo());
-                                customer.setSendLogisticsCompany(noreasonBack.getNoreasonBackBackLogisticsCompany());
+                                customer.setBackLogisticsNo(noreasonBack.getNoreasonBackBackLogisticsNo());
+                                customer.setBackLogisticsCompany(noreasonBack.getNoreasonBackBackLogisticsCompany());
                                 break;
                             }
                         }

+ 1 - 1
watero-rst-web/src/main/webapp/WEB-INF/views/cm/logistics/view_logistics.ftl

@@ -162,7 +162,7 @@
 <!-- <script src="//s.iamberry.com/wateroPF/js/shop/wechat-utils-1.0.js"></script> -->
 <script type="text/javascript">
     function pullupRefresh() {
-        var billCode = ${billCode!''};
+        var billCode = "${billCode!''}";
         var billName = "${billName!''}";
         mui.ajax('${path}/logistics/getExpressInfo?dates=' + new Date().getTime(), {
             data: {