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

Dev

See merge request quanshu/mp-server!274

mp-common/src/main/java/com/qs/mp/common/enums/ErrorCodeEnum.java

@@ -27,7 +27,7 @@ public enum ErrorCodeEnum {
   ERROR_CODE_1018(1018, "无权限查看"),
   ERROR_CODE_1019(1019, "盲票未付款"),
   ERROR_CODE_1020(1020, "库存不足"),
-  ERROR_CODE_1021(1021, "芒豆余额不足"),
+  ERROR_CODE_1021(1021, "盲豆余额不足"),
   ;
   private int code;
   private String msg;

mp-common/src/main/java/com/qs/mp/common/enums/PrizeStorageInTypeEnum.java

@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.annotation.IEnum;
 public enum PrizeStorageInTypeEnum implements IEnum<Integer> {
 
   TICKET_CASHED(1, "奖品兑奖"),
-  COIN_EXCHANGE(2, "芒豆兑换");
+  COIN_EXCHANGE(2, "盲豆兑换");
 
 
   private final int value;

mp-common/src/main/java/com/qs/mp/common/enums/TicketPrizeTypeEnum.java

@@ -15,7 +15,7 @@ public enum TicketPrizeTypeEnum implements IEnum<String> {
 
   GOODS("goods", "商品"),
   COUPON("coupon", "优惠券"),
-  COIN("coin", "芒豆");
+  COIN("coin", "盲豆");
 
   private final String value;
   private final String desc;

mp-service/src/main/java/com/qs/mp/admin/mapper/TicketMapper.java

@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Param;
  * @describe 盲票mapper类
  */
 public interface TicketMapper extends BaseMapper<Ticket> {
-  Ticket getRandOne(@Param(Constants.WRAPPER) Wrapper<Ticket> queryWrapper);
+  Ticket getRandOne(@Param("boxId") String boxId, @Param("status") int status);
 
   List<Ticket> listTicket(@Param(Constants.WRAPPER) Wrapper<Ticket> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/admin/service/ITicketService.java

@@ -1,15 +1,12 @@
 package com.qs.mp.admin.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.qs.mp.admin.domain.Ticket;
 import com.qs.mp.admin.domain.excel.TicketExcel;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
 /**
  * <p>
  * 盲票 服务类
@@ -22,10 +19,10 @@ public interface ITicketService extends IService<Ticket> {
 
   /**
    * 随机取一条
-   * @param queryWrapper
+   * @param boxId
    * @return
    */
-  Ticket getRandOne(Wrapper<Ticket> queryWrapper);
+  Ticket getRandOne(String boxId);
 
 
   /**

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

@@ -152,7 +152,7 @@ public class TicketBoxServiceImpl extends ServiceImpl<TicketBoxMapper, TicketBox
           awardsPrize.setPicUrl(coupon.getPicUrl());
           awardsPrize.setValue(coupon.getDiscount());
         } else {
-          awardsPrize.setTitle("芒豆");
+          awardsPrize.setTitle("盲豆");
           awardsPrize.setPicUrl("md.jpeg");
         }
         awardsPrizeList.add(awardsPrize);

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

@@ -37,8 +37,8 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
 	private int pageSize;
 
 	@Override
-	public Ticket getRandOne(Wrapper<Ticket> queryWrapper) {
-		return getBaseMapper().getRandOne(queryWrapper);
+	public Ticket getRandOne(String boxId) {
+		return getBaseMapper().getRandOne(boxId, 1);
 	}
 
 	@Override

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -325,8 +325,7 @@ public class UserTicketOrderServiceImpl extends
       Ticket ticket;
       if (ticketOrder.getResource() == TicketTypeEnum.ONLINE) {
         // 线上票，要先分配票ticketId
-        ticket = ticketService.getRandOne(new QueryWrapper<Ticket>()
-            .eq("box_id", ticketOrder.getBoxId()).eq("status", TicketStatusEnum.NOT_PAY));
+        ticket = ticketService.getRandOne(ticketOrder.getBoxId());
         orderItem.setTicketId(ticket.getTicketId());
         boolean rst = userTicketOrderItemService.updateById(orderItem);
         Assert.isTrue(rst, "支付回调用户购票订单处理，更新订单明细的盲票ID失败，itemId:" + orderItem.getItemId());

mp-service/src/main/resources/mapper/admin/TicketMapper.xml

@@ -27,8 +27,8 @@
     <select id="getRandOne" resultMap="BaseResultMap">
         select t1.*
         from mp_ticket  as t1
-            JOIN  (SELECT ROUND(RAND() * (SELECT MAX(ticket_id) FROM mp_ticket ${ew.customSqlSegment} )) AS id) AS t2
-        WHERE t1.ticket_id >= t2.id
+            JOIN  (SELECT ROUND(RAND() * (SELECT MAX(ticket_id) FROM mp_ticket where box_id = #{boxId} AND status = #{status} )) AS id) AS t2
+        WHERE t1.ticket_id >= t2.id and t1.box_id = #{boxId} AND t1.status = #{status}
         ORDER BY t1.ticket_id LIMIT 1;
     </select>