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

线下盲票扫码购买订单结算

See merge request quanshu/mp-server!369

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketOrderController.java

@@ -132,7 +132,7 @@ public class UserTicketOrderController extends BaseApiController {
     // 当前没有运费和优惠，实付金额=订单金额
     orderSettleVO.setPayAmt(orderAmt - discountAmt);
     orderSettleVO.setOrderNum(param.getOrderNum());
-    orderSettleVO.setBoxId(param.getBoxId());
+    orderSettleVO.setBoxId(ticketBox.getBoxId());
     orderSettleVO.setTicketId(param.getTicketId());
     orderSettleVO.setPicUrl(ticketBox.getPicUrl());
     orderSettleVO.setTitle(ticketBox.getTitle());