取餐码获取为null修复
This commit is contained in:
@@ -979,10 +979,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
|
|||||||
TbOrderInfo orderInfo = orderInfoMapper.selectById(orderId);
|
TbOrderInfo orderInfo = orderInfoMapper.selectById(orderId);
|
||||||
if (orderInfo != null) {
|
if (orderInfo != null) {
|
||||||
JSONObject jsonObject = new JSONObject();
|
JSONObject jsonObject = new JSONObject();
|
||||||
|
if (orderInfo.getMasterId() != null) {
|
||||||
jsonObject.put("masterId", orderInfo.getMasterId());
|
jsonObject.put("masterId", orderInfo.getMasterId());
|
||||||
return jsonObject;
|
return jsonObject;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
String account = tokenProvider.getSubject();
|
String account = tokenProvider.getSubject();
|
||||||
if (account == null) {
|
if (account == null) {
|
||||||
throw new BadRequestException("token解析失败");
|
throw new BadRequestException("token解析失败");
|
||||||
|
|||||||
Reference in New Issue
Block a user