Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!678

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelOrderController.java

@@ -236,7 +236,7 @@ public class ChannelOrderController extends BaseApiController {
       }
     } else {
       TicketBox ticketBox = ticketBoxService.getById(param.getBoxId());
-      if (param.getIsPre() == 1) {
+      if (Objects.nonNull(param.getIsPre()) && param.getIsPre() == 1) {
         // 预购票金额计算处理
         orderAmt = ticketBox.getPkgPrePrice() * param.getOrderNum();
         // 设置类型