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

Dev

See merge request quanshu/mp-server!561

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

@@ -134,10 +134,10 @@ public class UserTicketController extends BaseApiController {
       queryWrapper.eq("box_id",ticketBox.getBoxId());
       Integer num = ticketAwardsService.groupSumQuantityByQueryWrapper(queryWrapper);
       if (Objects.isNull(num) || num == 0) {
-        continue;
+        ticketAwardsLabelVO.setHitRate(new BigDecimal(0));
+      }else {
+        ticketAwardsLabelVO.setHitRate(new BigDecimal(num).divide(new BigDecimal(quantity), 1, RoundingMode.HALF_UP));
       }
-      ticketAwardsLabelVO.setHitRate(new BigDecimal(num).divide(new BigDecimal(quantity),1,RoundingMode.HALF_UP));
-
       ticketAwardsLabelVOS.add(ticketAwardsLabelVO);
     }
     ticketBoxVO.setTicketAwardsLabelList(ticketAwardsLabelVOS);