|
@@ -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);
|