|
@@ -641,11 +641,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
});
|
|
});
|
|
//添加卡号
|
|
//添加卡号
|
|
Staff staff = staffService.getById(order.getUserId());
|
|
Staff staff = staffService.getById(order.getUserId());
|
|
- Optional.ofNullable(staff).orElseThrow(() -> new CustomException("卡号不能为空"));
|
|
|
|
|
|
+ Optional.ofNullable(staff).orElseThrow(() -> new CustomException("用户信息不存在"));
|
|
Optional.ofNullable(staff.getCardId()).orElseThrow(() -> new CustomException("卡号不能为空"));
|
|
Optional.ofNullable(staff.getCardId()).orElseThrow(() -> new CustomException("卡号不能为空"));
|
|
order.setCard(staff.getCardId());
|
|
order.setCard(staff.getCardId());
|
|
order.setUserName(staff.getName());
|
|
order.setUserName(staff.getName());
|
|
order.setUserPhone(staff.getContacts());
|
|
order.setUserPhone(staff.getContacts());
|
|
|
|
+ //判断卡同步成功
|
|
|
|
+ Assert.check(msgLogService.isSuccess(order.getUserId()),"人员同步失败,请手动同步人员信息");
|
|
}else {
|
|
}else {
|
|
if (null != order.getChannelId() && 0 != order.getChannelId()){
|
|
if (null != order.getChannelId() && 0 != order.getChannelId()){
|
|
TopChannel topChannel = topChannelService.getById(order.getChannelId());
|
|
TopChannel topChannel = topChannelService.getById(order.getChannelId());
|