From d29e50dbf16e6d950f376e350fc3ea61470cef7c Mon Sep 17 00:00:00 2001 From: liuhongfeng Date: Sat, 1 Feb 2020 15:44:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=B8=AD=E5=BF=83=E7=AB=AF=EF=BC=8C=E9=80=81=E8=B4=A7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=BF=AB=E9=80=92=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=97=B6=E5=80=99=E6=8A=A5=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/jpress/web/front/OrderController.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jpress-web/src/main/java/io/jpress/web/front/OrderController.java b/jpress-web/src/main/java/io/jpress/web/front/OrderController.java index a29c32964..313c538c4 100644 --- a/jpress-web/src/main/java/io/jpress/web/front/OrderController.java +++ b/jpress-web/src/main/java/io/jpress/web/front/OrderController.java @@ -66,11 +66,12 @@ public class OrderController extends UcenterControllerBase { //如果快递已经发货 if (order.isDeliveried()) { UserOrderDelivery delivery = deliveryService.findById(order.getDeliveryId()); - List expressInfos = ExpressUtil.queryExpress(delivery.getCompany(), delivery.getNumber()); - setAttr("expressInfos", expressInfos); + if(delivery!=null){ + List expressInfos = ExpressUtil.queryExpress(delivery.getCompany(), delivery.getNumber()); + setAttr("expressInfos", expressInfos); + } } - setAttr("order", order); OrderManager.me().renderUCenterOrderDetailPage(this,order); -- Gitee From 585acdeb2adb9e265a77c62d19ee4baeefad1104 Mon Sep 17 00:00:00 2001 From: liuhongfeng Date: Sat, 1 Feb 2020 16:02:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=85=A5?= =?UTF-8?q?=E8=B4=A6=E7=9A=84=E9=87=91=E9=A2=9D=E8=87=AA=E5=8A=A8=E5=B8=A6?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=EF=BC=8C=E6=96=B9=E4=BE=BF=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=EF=BC=8C=E9=81=BF=E5=85=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=E9=94=99=E8=AF=AF=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/views/admin/finance/layer_payupdate.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jpress-web/src/main/webapp/WEB-INF/views/admin/finance/layer_payupdate.html b/jpress-web/src/main/webapp/WEB-INF/views/admin/finance/layer_payupdate.html index 5f6a33b1c..844b9295e 100755 --- a/jpress-web/src/main/webapp/WEB-INF/views/admin/finance/layer_payupdate.html +++ b/jpress-web/src/main/webapp/WEB-INF/views/admin/finance/layer_payupdate.html @@ -70,7 +70,7 @@

注意注意注意：一旦入账成功不可进行回退。

-- Gitee From dac217840c8cd0c82a5192db0abc929bfa3385f4 Mon Sep 17 00:00:00 2001 From: liuhongfeng Date: Sat, 1 Feb 2020 16:38:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E7=AC=A6=E4=B8=B2=E3=80=90=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E3=80=91=E4=B8=BA=E3=80=90=E5=AE=9E=E9=99=85=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/admin/finance/layer_payout_process.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jpress-web/src/main/webapp/WEB-INF/views/admin/finance/layer_payout_process.html b/jpress-web/src/main/webapp/WEB-INF/views/admin/finance/layer_payout_process.html index f04d37432..61ba56586 100755 --- a/jpress-web/src/main/webapp/WEB-INF/views/admin/finance/layer_payout_process.html +++ b/jpress-web/src/main/webapp/WEB-INF/views/admin/finance/layer_payout_process.html @@ -62,7 +62,7 @@
- +
Date: Sat, 1 Feb 2020 17:13:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=82=AE=E6=94=BF=E7=BC=96=E7=A0=81=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/webapp/WEB-INF/views/ucenter/address/address_edit.html | 1 + 1 file changed, 1 insertion(+) diff --git a/jpress-web/src/main/webapp/WEB-INF/views/ucenter/address/address_edit.html b/jpress-web/src/main/webapp/WEB-INF/views/ucenter/address/address_edit.html index a3b3ee090..0deb65bbf 100644 --- a/jpress-web/src/main/webapp/WEB-INF/views/ucenter/address/address_edit.html +++ b/jpress-web/src/main/webapp/WEB-INF/views/ucenter/address/address_edit.html @@ -90,6 +90,7 @@
+

邮政编码 获取

-- Gitee