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

优化

See merge request quanshu/mp-server!476

mp-service/src/main/java/com/qs/mp/admin/service/impl/TicketBoxServiceImpl.java

@@ -194,6 +194,11 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
             awardsPrize.setTitle(coupon.getTitle());
             awardsPrize.setPicUrl(coupon.getPicUrl());
             awardsPrize.setValue(coupon.getDiscount());
+          } else if (ticketAwardsPrizeParam.getPrizeType() == TicketPrizeTypeEnum.COUPON_PKG) {
+            CouponPkg couponPkg = couponPkgService.getById(awardsPrize.getRefId());
+            awardsPrize.setTitle(couponPkg.getTitle());
+            awardsPrize.setValue(couponPkg.getFacePrice());
+            awardsPrize.setPicUrl(couponPkg.getPicUrl());
           } else {
             awardsPrize.setTitle("盲豆");
             awardsPrize.setPicUrl("md.jpeg");