浏览代码

展示已关联的盲票产品(bug修复)

zhangkaikai 1 年之前
父节点
当前提交
423dfc8fe2

+ 2 - 4
mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

@@ -22,10 +22,7 @@ import com.qs.mp.common.annotation.Log;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.core.redis.DistributedLocker;
-import com.qs.mp.common.enums.BusinessType;
-import com.qs.mp.common.enums.ErrorCodeEnum;
-import com.qs.mp.common.enums.GoodsStatusEnum;
-import com.qs.mp.common.enums.GoodsTypeEnum;
+import com.qs.mp.common.enums.*;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.framework.redis.RedisLockKey;
 import com.qs.mp.utils.ExcelUtil;
@@ -349,6 +346,7 @@ public class GoodsMgrController extends BaseApiController {
         }
         QueryWrapper<TicketBoxGoodsListVO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("t2.ref_id", goodsId);
+        queryWrapper.eq("t2.prize_type", TicketBoxGoodsTypeEnum.GOODS.getValue());
         queryWrapper.orderByAsc("FIELD('on', `status`, 'wait', 'doing', 'done', 'off')");
         List<TicketBox> ticketBoxList = ticketAwardsPrizeService.listTicketDetailRelGoods(queryWrapper);
         return getDataTable(ticketBoxList);

+ 1 - 1
mp-service/src/main/resources/mapper/admin/TicketAwardsPrizeMapper.xml

@@ -84,7 +84,7 @@
 
     <select id="listTicketDetailRelGoodsId" resultType="com.qs.mp.admin.domain.TicketBox">
         select
-        t1.box_id,t1.title,t1.status
+        DISTINCT t1.box_id,t1.title,t1.status
         from mp_ticket_box t1 left join mp_ticket_awards_prize t2 on t1.box_id = t2.box_id
         ${ew.customSqlSegment}
     </select>