游客充值添加校验

src/main/java/com/usky/dxtop/service/impl/OrderServiceImpl.java

@@ -647,9 +647,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             order.setUserName(staff.getName());
             order.setUserPhone(staff.getContacts());
         }else {
-            Assert.check(null != order.getChannelId() && 0 != order.getChannelId(),"渠道编号不能为空");
-            TopChannel topChannel = topChannelService.getById(order.getChannelId());
-            order.setChannelName(topChannel.getName());
+            if (null != order.getChannelId() && 0 != order.getChannelId()){
+                TopChannel topChannel = topChannelService.getById(order.getChannelId());
+                Assert.check(null != topChannel,"渠道信息不存在");
+                order.setChannelId(topChannel.getId().intValue());
+                order.setChannelName(topChannel.getName());
+            }else {
+                Assert.check(StringUtils.isNotBlank(order.getChannelName()),"渠道名称不能为空");
+                order.setChannelName(order.getChannelName());
+            }
         }
         this.save(order);
     }