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

Dev

See merge request quanshu/mp-server!445

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderServiceImpl.java

@@ -224,8 +224,10 @@ public class ChannelOrderServiceImpl extends
             }
         }
 
-        // 获取支付订单号
-        PayOrder payOrder = payOrderService.getOne(new LambdaQueryWrapper<PayOrder>().eq(PayOrder::getBizId, channelOrder.getOrderId()));
+        // 获取支付成功的订单号
+        PayOrder payOrder = payOrderService.getOne(new LambdaQueryWrapper<PayOrder>()
+                .eq(PayOrder::getBizId, channelOrder.getOrderId())
+                .eq(PayOrder::getOrderStatus, PayOrderStatusEnum.SUCCESS));
         if (Objects.isNull(payOrder)) {
             throw new ServiceException("支付订单不存在");
         }

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

@@ -29,7 +29,12 @@
         select t1.item_id,
                 t1.title,
                 t1.pic_url,
-                t3.*,
+                t3.ticket_id,
+                t3.box_id,
+                t3.serial_no,
+                t3.face_price,
+                t3.plain_lucky_num,
+                t3.`status`,
                 t6.title prizeInfo,
                 t6.`value`,
                 t6.prize_type