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

Dev

See merge request quanshu/mp-server!470

mp-quartz/src/main/java/com/qs/mp/quartz/task/DayStatTask.java

@@ -220,10 +220,16 @@ public class DayStatTask {
             .select("IFNULL(sum(money) ,0) as withdrawAmt")
             .lambda().lt(ChannelWithdraw::getCreateTime, DateUtils.addDays(bizDay, 1))
             .eq(ChannelWithdraw::getStatus, ChannelWithdrawStatusEnum.FINISHED));
+    Map<String, Object> allAcctMoneyMap = channelService.getMap(
+        new QueryWrapper<Channel>()
+            .select("IFNULL(sum(money) ,0) as acctAmt"));
     if (null != withdrawMap) {
       sb.append("累计提现：").append(
               new BigDecimal(Integer.valueOf(String.valueOf(allWithdrawMap.get("withdrawAmt")))).divide(
                   new BigDecimal(100), 2, RoundingMode.DOWN))
+          .append("元，待提现：").append(
+              new BigDecimal(Integer.valueOf(String.valueOf(allAcctMoneyMap.get("acctAmt")))).divide(
+                  new BigDecimal(100), 2, RoundingMode.DOWN))
           .append("元，当日：").append(
               new BigDecimal(Integer.valueOf(String.valueOf(withdrawMap.get("withdrawAmt")))).divide(
                   new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -242,7 +242,7 @@ public class UserTicketOrderServiceImpl extends
     UserTicketOrder ticketOrder = new UserTicketOrder();
     ticketOrder.setOrderId(bizIdGenerator.newIdWithUidSharding(String.valueOf(userId)));
     ticketOrder.setUserId(userId);
-    ticketOrder.setTitle(ticket.getTitle());
+    ticketOrder.setTitle(ticketBox.getTitle());
     ticketOrder.setBoxId(ticket.getBoxId());
     ticketOrder.setSalePrice(ticketBox.getSalePrice());
     ticketOrder.setSaleCommRate(ticketBox.getSaleCommRate());