Merge branch 'develop'

7 years ago · 2b82ee9375
parent 556e2fd572 b2fca795d0
commit 2b82ee9375
1 changed files with 8 additions and 4 deletions
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
@ -418,13 +418,17 @@ public class RetailAppServiceImp implements RetailAppService {
            switch (order.getString("channel")) {
                case "Alipay":
                    JSONObject alipayUser = customerRelationAlipayMapper.findCustomerByUserId(customer_id);
-                    order.put("nickname", alipayUser.getString("nickname"));
-                    order.put("headimg", alipayUser.getString("headimg"));
+                    if (alipayUser!=null){
+                        order.put("nickname", alipayUser.getString("nickname"));
+                        order.put("headimg", alipayUser.getString("headimg"));
+                    }
                    break;
                case "Wechat":
                    JSONObject weUser = customerMapper.findCustomerByOpenId(customer_id);
-                    order.put("nickname", weUser.getString("nickname"));
-                    order.put("headimg", weUser.getString("headimg"));
+                    if (weUser!=null){
+                        order.put("nickname", weUser.getString("nickname"));
+                        order.put("headimg", weUser.getString("headimg"));
+                    }
                    break;
                default:
                    break;