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

优化

See merge request quanshu/mp-server!943

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

@@ -147,7 +147,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
                 TicketBoxGoods boxGoods = new TicketBoxGoods();
                 BeanUtils.copyProperties(ticketBoxGoods, boxGoods);
                 boxGoods.setBoxId(ticketBox.getBoxId());
-                if (TicketBoxGoodsTypeEnum.COUPON.equals(boxGoods.getType())) {
+                if (TicketBoxGoodsTypeEnum.COUPON.equals(ticketBoxGoods.getType())) {
                     Coupon coupon = couponService.getById(boxGoods.getRefId());
                     if (coupon == null) {
                         LogUtil.error(logger,"关联优惠券信息不存在,boxId:{0}", ticketBox.getBoxId());
@@ -156,7 +156,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
                     boxGoods.setTitle(coupon.getTitle());
                     boxGoods.setPicUrl(coupon.getPicUrl());
                     boxGoods.setValue(coupon.getDiscount());
-                } else if (TicketBoxGoodsTypeEnum.COUPON_PKG.equals(boxGoods.getType())) {
+                } else if (TicketBoxGoodsTypeEnum.COUPON_PKG.equals(ticketBoxGoods.getType())) {
                     CouponPkg couponPkg = couponPkgService.getById(boxGoods.getRefId());
                     if (couponPkg == null) {
                         LogUtil.error(logger,"关联券包信息不存在,boxId:{0}", ticketBox.getBoxId());