diff --git a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java
index a3258b24..aad8b991 100644
--- a/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java
+++ b/xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java
@@ -80,8 +80,10 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService {
                 //发送请求所返回的响应信息
                 R<Map<String, Object>> result = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null, userMessage.getTenantId());
                 Map<String, Object> userInfo = result.getData();
-                String avatar = (String) userInfo.get("avatar");
-                xhpcMessageBoardReceiveUser.setUserIcon(avatar);
+                if(userInfo !=null && userInfo.get("avatar") !=null){
+                    String avatar = (String) userInfo.get("avatar");
+                    xhpcMessageBoardReceiveUser.setUserIcon(avatar);
+                }
                 xhpcMessageBoardReceiveUser.setHaveNewInfo(0);
                 xhpcMessageBoardReceiveUserMapper.insertSelective(xhpcMessageBoardReceiveUser);
             } else {
@@ -106,8 +108,10 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService {
                 //发送请求所返回的响应信息
                 R<Map<String, Object>> result = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null, userMessage.getTenantId());
                 Map<String, Object> userInfo = result.getData();
-                String avatar = (String) userInfo.get("avatar");
-                xhpcMessageBoardReceiveUser.setUserIcon(avatar);
+                if(userInfo !=null && userInfo.get("avatar")!=null){
+                    String avatar = (String) userInfo.get("avatar");
+                    xhpcMessageBoardReceiveUser.setUserIcon(avatar);
+                }
                 xhpcMessageBoardReceiveUser.setHaveNewInfo(0);
                 xhpcMessageBoardReceiveUserMapper.insertSelective(xhpcMessageBoardReceiveUser);
             } else {
diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
index ec6736e6..af928810 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
@@ -291,12 +291,15 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
             if (r1.getCode() != 200) {
                 return AjaxResult.error(r1.getMsg());
             }
-            xhpcChargeOrder.setRateModelId(Long.valueOf(r1.getData().toString()));
-            xhpcChargeOrderMapper.updateXhpcChargeOrder(xhpcChargeOrder);
-            //插一帧实时数据
-            extracted(xhpcChargeOrder);
+            try{
+                xhpcChargeOrder.setRateModelId(Long.valueOf(r1.getData().toString()));
+                xhpcChargeOrderMapper.updateXhpcChargeOrder(xhpcChargeOrder);
+                //插一帧实时数据
+                extracted(xhpcChargeOrder);
+            }catch (Exception e){
+               logger.error("update order[{}] failed.", orderNo);
+            }
             return AjaxResult.success();
-
         }else{
             return AjaxResult.error(UserTypeUtil.LOGIN_TYPE, "请重新登录");
         }
@@ -785,7 +788,6 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
                 }else{
                     number=Integer.parseInt(operatorMessage.get("soc").toString());
                 }
-
             }
             map.put("soc",number);
             return R.ok(map);