|
@@ -647,7 +647,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
//非游客充值
|
|
//非游客充值
|
|
if (!OrderSceneCode.VISITOR.getCode().equals(order.getScene())){
|
|
if (!OrderSceneCode.VISITOR.getCode().equals(order.getScene())){
|
|
Assert.check(null != order.getUserId() && 0 != order.getUserId(),"用户编号不能为空");
|
|
Assert.check(null != order.getUserId() && 0 != order.getUserId(),"用户编号不能为空");
|
|
- Assert.check(StringUtils.isNotBlank(order.getUserName()),"用户名称不能为空");
|
|
|
|
|
|
+// Assert.check(StringUtils.isNotBlank(order.getUserName()),"用户名称不能为空");
|
|
// Assert.check(StringUtils.isNotBlank(order.getUserPhone()),"用户手机号不能为空");
|
|
// Assert.check(StringUtils.isNotBlank(order.getUserPhone()),"用户手机号不能为空");
|
|
//app充值
|
|
//app充值
|
|
if (OrderSceneCode.ERP_APP.getCode().equals(order.getScene()) || OrderSceneCode.COMMON_APP.getCode().equals(order.getScene())) {
|
|
if (OrderSceneCode.ERP_APP.getCode().equals(order.getScene()) || OrderSceneCode.COMMON_APP.getCode().equals(order.getScene())) {
|
|
@@ -675,6 +675,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
|
|
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.setUserPhone(staff.getContacts());
|
|
}else {
|
|
}else {
|
|
Assert.check(null != order.getChannelId() && 0 != order.getChannelId(),"渠道编号不能为空");
|
|
Assert.check(null != order.getChannelId() && 0 != order.getChannelId(),"渠道编号不能为空");
|
|
TopChannel topChannel = topChannelService.getById(order.getChannelId());
|
|
TopChannel topChannel = topChannelService.getById(order.getChannelId());
|