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

Dev

See merge request quanshu/mp-server!698

mp-service/src/main/java/com/qs/mp/admin/domain/TicketBox.java

@@ -13,6 +13,7 @@ import com.qs.mp.common.enums.TicketTypeEnum;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.Objects;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -232,7 +233,10 @@ public class TicketBox implements Serializable {
 
   @ApiModelProperty("预付票包价格")
   public Integer getPkgPrePrice() {
-    return this.prePrice * this.pkgUnit;
+    if (Objects.nonNull(this.prePrice) && Objects.nonNull(this.pkgUnit)) {
+      return this.prePrice * this.pkgUnit;
+    }
+    return 0;
   }
 
 }

mp-service/src/main/resources/mapper/user/UserTicketOrderMapper.xml

@@ -206,5 +206,6 @@
 		left join mp_ticket_box b on a.box_id = b.box_id
 		group by a.box_id, b.title
 		ORDER BY payAmt DESC
+		limit 10
 	</select>
 </mapper>