diff --git a/jpress-web/src/main/java/io/jpress/web/admin/_OrderController.java b/jpress-web/src/main/java/io/jpress/web/admin/_OrderController.java index b7268bd1866bef88931231e267d8e2579ba7a205..423707ef08dc07c7b08425fd374ccf44e1f3c921 100644 --- a/jpress-web/src/main/java/io/jpress/web/admin/_OrderController.java +++ b/jpress-web/src/main/java/io/jpress/web/admin/_OrderController.java @@ -34,6 +34,7 @@ import io.jpress.web.commons.express.ExpressInfo; import io.jpress.web.commons.express.ExpressUtil; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; /** @@ -106,7 +107,10 @@ public class _OrderController extends AdminControllerBase { //如果快递已经发货 if (order.isDeliveried()) { UserOrderDelivery delivery = deliveryService.findById(order.getDeliveryId()); - List expressInfos = ExpressUtil.queryExpress(delivery.getCompany(), delivery.getNumber()); + List expressInfos= new ArrayList<>(); + if(delivery!=null){ + expressInfos = ExpressUtil.queryExpress(delivery.getCompany(), delivery.getNumber()); + } setAttr("expressInfos", expressInfos); } diff --git a/jpress-web/src/main/java/io/jpress/web/commons/express/ExpressUtil.java b/jpress-web/src/main/java/io/jpress/web/commons/express/ExpressUtil.java index d45ea43b83f6fccaf59b0308dc6533a540849502..fccb88d2b7117aa4a10451ccabe6c1f72230e1fd 100644 --- a/jpress-web/src/main/java/io/jpress/web/commons/express/ExpressUtil.java +++ b/jpress-web/src/main/java/io/jpress/web/commons/express/ExpressUtil.java @@ -36,6 +36,10 @@ public class ExpressUtil { } String type = JPressOptions.get("express_api_type"); + //没有设置快递接口的时候 + if (type == null) { + return null; + } ExpressQuerier querier = ExpressQuerierFactory.get(type); if (querier == null) { diff --git a/jpress-web/src/main/webapp/WEB-INF/views/front/pay/pay_alipayx.html b/jpress-web/src/main/webapp/WEB-INF/views/front/pay/pay_alipayx.html index 29937e6fea2fcd13f9f3b4225f26e26e0d7c2cdb..4eee8bb7e328b193db595e4cebeef7c60236a126 100755 --- a/jpress-web/src/main/webapp/WEB-INF/views/front/pay/pay_alipayx.html +++ b/jpress-web/src/main/webapp/WEB-INF/views/front/pay/pay_alipayx.html @@ -29,7 +29,7 @@
- +
#if(payConfig && payConfig.message) diff --git a/jpress-web/src/main/webapp/static/commons/img/pay-ali.png b/jpress-web/src/main/webapp/static/commons/img/pay-ali.png new file mode 100644 index 0000000000000000000000000000000000000000..138e46c3f21eea4f69d956aa7719d89c933d0a44 Binary files /dev/null and b/jpress-web/src/main/webapp/static/commons/img/pay-ali.png differ