|
@@ -1,16 +1,12 @@
|
|
|
package com.qs.mp.web.controller.api.admin;
|
|
|
|
|
|
-import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
|
|
|
import com.github.xiaoymin.knife4j.annotations.DynamicParameters;
|
|
|
-import com.qs.mp.admin.domain.Goods;
|
|
|
-import com.qs.mp.admin.domain.GoodsCard;
|
|
|
-import com.qs.mp.admin.domain.GoodsSku;
|
|
|
-import com.qs.mp.admin.domain.GoodsTagRel;
|
|
|
+import com.qs.mp.admin.domain.*;
|
|
|
import com.qs.mp.admin.domain.excel.GoodsCardImportExcel;
|
|
|
import com.qs.mp.admin.domain.excel.GoodsExcel;
|
|
|
import com.qs.mp.admin.domain.param.GoodsCardQueryParam;
|
|
@@ -19,10 +15,9 @@ import com.qs.mp.admin.domain.param.GoodsQueryParam;
|
|
|
import com.qs.mp.admin.domain.param.GoodsUpdateSortWeightParam;
|
|
|
import com.qs.mp.admin.domain.vo.GoodsExportVO;
|
|
|
import com.qs.mp.admin.domain.vo.GoodsVO;
|
|
|
-import com.qs.mp.admin.service.IGoodsCardService;
|
|
|
-import com.qs.mp.admin.service.IGoodsService;
|
|
|
-import com.qs.mp.admin.service.IGoodsSkuService;
|
|
|
-import com.qs.mp.admin.service.IGoodsTagRelService;
|
|
|
+import com.qs.mp.admin.domain.vo.TicketBoxGoodsListVO;
|
|
|
+import com.qs.mp.admin.domain.vo.TicketVO;
|
|
|
+import com.qs.mp.admin.service.*;
|
|
|
import com.qs.mp.common.annotation.Log;
|
|
|
import com.qs.mp.common.core.domain.AjaxResult;
|
|
|
import com.qs.mp.common.core.page.TableDataInfo;
|
|
@@ -89,6 +84,9 @@ public class GoodsMgrController extends BaseApiController {
|
|
|
@Autowired
|
|
|
private DistributedLocker distributedLocker;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private ITicketAwardsPrizeService ticketAwardsPrizeService;
|
|
|
+
|
|
|
|
|
|
@PostMapping("/card/list")
|
|
|
@PreAuthorize("@ss.hasPermi('business:goods:query')")
|
|
@@ -331,6 +329,30 @@ public class GoodsMgrController extends BaseApiController {
|
|
|
return AjaxResult.success(goodsVo);
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 查询商品关联盲票
|
|
|
+ */
|
|
|
+ @PostMapping(value = "/detail/relationTicket")
|
|
|
+ @PreAuthorize("@ss.hasPermi('business:goods:query')")
|
|
|
+ @ApiOperation("查询商品关联的上架盲票")
|
|
|
+ @DynamicParameters(properties = {
|
|
|
+ @DynamicParameter(name = "goodsId", value = "商品id", required = true, dataTypeClass = Long.class)
|
|
|
+ })
|
|
|
+ @ApiResponses(
|
|
|
+ @ApiResponse(code = 200, message = "查询成功", response = TicketBox.class)
|
|
|
+ )
|
|
|
+ public AjaxResult detailRelationTicket(@RequestBody JSONObject jsonObject) {
|
|
|
+ String goodsId = jsonObject.getString("goodsId");
|
|
|
+ if (null == goodsId) {
|
|
|
+ return error(ErrorCodeEnum.ERROR_CODE_1001);
|
|
|
+ }
|
|
|
+ QueryWrapper<TicketBoxGoodsListVO> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq("t2.ref_id", goodsId);
|
|
|
+ queryWrapper.orderByAsc("FIELD('on', `status`, 'wait', 'doing', 'done', 'off')");
|
|
|
+ List<TicketBox> ticketBoxList = ticketAwardsPrizeService.listTicketDetailRelGoods(queryWrapper);
|
|
|
+ return AjaxResult.success(ticketBoxList);
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
* 新增商品信息
|
|
@@ -527,37 +549,6 @@ public class GoodsMgrController extends BaseApiController {
|
|
|
return AjaxResult.success("操作成功");
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 批量上下架商品
|
|
|
- */
|
|
|
- @Log(title = "批量上下架商品",businessType = BusinessType.UPDATE)
|
|
|
- @ApiOperation(value = "批量上下架商品",notes = "批量上下架商品")
|
|
|
- @PostMapping("/batchStatus")
|
|
|
- @PreAuthorize("@ss.hasPermi('business:goods:on')")
|
|
|
- public AjaxResult batchGoodsStatus(@RequestBody JSONObject jsonObject) {
|
|
|
- JSONArray goodsIdList = jsonObject.getJSONArray("goodsIdList");
|
|
|
- GoodsStatusEnum status = GoodsStatusEnum.getStatusEnum(jsonObject.getString("status"));
|
|
|
- if (CollectionUtils.isEmpty(goodsIdList) || null == status) {
|
|
|
- return error(ErrorCodeEnum.ERROR_CODE_1001);
|
|
|
- }
|
|
|
-
|
|
|
- List<Goods> updateGoodsList = new ArrayList<>();
|
|
|
- for (Object o : goodsIdList) {
|
|
|
- Goods goods = new Goods();
|
|
|
- goods.setGoodsId((Long) o);
|
|
|
- goods.setStatus(status);
|
|
|
- updateGoodsList.add(goods);
|
|
|
- }
|
|
|
-
|
|
|
- try {
|
|
|
- goodsService.updateBatchById(updateGoodsList);
|
|
|
- // 关联盲票商品
|
|
|
- } catch (Exception e) {
|
|
|
- return AjaxResult.error("操作失败");
|
|
|
- }
|
|
|
- return AjaxResult.success("操作成功");
|
|
|
- }
|
|
|
-
|
|
|
|
|
|
/**
|
|
|
* 删除商品(假删)
|