yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改防止订单不生成

Browse Source
This commit is contained in:
yuyang 2022-03-15 11:19:16 +08:00
parent 1f25942aab
commit c005314430
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xhpc-modules/xhpc-message-board/src/main/java/com/xhpc/board/service/impl/XhpcMessageBoardServiceImpl.java
View File

@ -80,8 +80,10 @@ public class XhpcMessageBoardServiceImpl implements XhpcMessageBoardService {
//发送请求所返回的响应信息 //发送请求所返回的响应信息
R<Map<String, Object>> result = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null, userMessage.getTenantId()); R<Map<String, Object>> result = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null, userMessage.getTenantId());
Map<String, Object> userInfo = result.getData(); Map<String, Object> userInfo = result.getData();
if(userInfo !=null && userInfo.get("avatar") !=null){
String avatar = (String) userInfo.get("avatar"); String avatar = (String) userInfo.get("avatar");
xhpcMessageBoardReceiveUser.setUserIcon(avatar); xhpcMessageBoardReceiveUser.setUserIcon(avatar);
}
xhpcMessageBoardReceiveUser.setHaveNewInfo(0); xhpcMessageBoardReceiveUser.setHaveNewInfo(0);
xhpcMessageBoardReceiveUserMapper.insertSelective(xhpcMessageBoardReceiveUser); xhpcMessageBoardReceiveUserMapper.insertSelective(xhpcMessageBoardReceiveUser);
} else { } 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()); R<Map<String, Object>> result = userTypeService.getUser(null, loginUser.getUserid(), loginUser.getUserType(), null, userMessage.getTenantId());
Map<String, Object> userInfo = result.getData(); Map<String, Object> userInfo = result.getData();
if(userInfo !=null && userInfo.get("avatar")!=null){
String avatar = (String) userInfo.get("avatar"); String avatar = (String) userInfo.get("avatar");
xhpcMessageBoardReceiveUser.setUserIcon(avatar); xhpcMessageBoardReceiveUser.setUserIcon(avatar);
}
xhpcMessageBoardReceiveUser.setHaveNewInfo(0); xhpcMessageBoardReceiveUser.setHaveNewInfo(0);
xhpcMessageBoardReceiveUserMapper.insertSelective(xhpcMessageBoardReceiveUser); xhpcMessageBoardReceiveUserMapper.insertSelective(xhpcMessageBoardReceiveUser);
} else { } else {

6
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java
View File

@ -291,12 +291,15 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
if (r1.getCode() != 200) { if (r1.getCode() != 200) {
return AjaxResult.error(r1.getMsg()); return AjaxResult.error(r1.getMsg());
} }
try{
xhpcChargeOrder.setRateModelId(Long.valueOf(r1.getData().toString())); xhpcChargeOrder.setRateModelId(Long.valueOf(r1.getData().toString()));
xhpcChargeOrderMapper.updateXhpcChargeOrder(xhpcChargeOrder); xhpcChargeOrderMapper.updateXhpcChargeOrder(xhpcChargeOrder);
//插一帧实时数据 //插一帧实时数据
extracted(xhpcChargeOrder); extracted(xhpcChargeOrder);
}catch (Exception e){
logger.error("update order[{}] failed.", orderNo);
}
return AjaxResult.success(); return AjaxResult.success();
}else{ }else{
return AjaxResult.error(UserTypeUtil.LOGIN_TYPE, "请重新登录"); return AjaxResult.error(UserTypeUtil.LOGIN_TYPE, "请重新登录");
} }
@ -785,7 +788,6 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar
}else{ }else{
number=Integer.parseInt(operatorMessage.get("soc").toString()); number=Integer.parseInt(operatorMessage.get("soc").toString());
} }
} }
map.put("soc",number); map.put("soc",number);
return R.ok(map); return R.ok(map);