diff --git a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java index 3563ba36..1520e85c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java @@ -12,6 +12,7 @@ import co.yixiang.dozer.service.IGenerator; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.mp.domain.YxWechatLive; import co.yixiang.modules.mp.service.YxWechatLiveService; +import co.yixiang.modules.mp.service.dto.UpdateGoodsDto; import co.yixiang.modules.mp.service.dto.YxWechatLiveDto; import co.yixiang.modules.mp.service.dto.YxWechatLiveQueryCriteria; import io.swagger.annotations.Api; @@ -72,6 +73,15 @@ public class YxWechatLiveController { return new ResponseEntity<>(yxWechatLiveService.saveLive(resources),HttpStatus.CREATED); } + + @PostMapping("/addGoods") + @Log("添加商品") + @ApiOperation("添加商品") + @PreAuthorize("@el.check('admin','yxWechatLive:add')") + public ResponseEntity addGoods(@Validated @RequestBody UpdateGoodsDto resources){ + return new ResponseEntity<>(yxWechatLiveService.addGoods(resources),HttpStatus.CREATED); + } + @PutMapping @Log("修改wxlive") @ApiOperation("修改wxlive") diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/YxWechatLiveService.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/YxWechatLiveService.java index 20507b43..48647423 100644 --- a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/YxWechatLiveService.java +++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/YxWechatLiveService.java @@ -10,6 +10,7 @@ package co.yixiang.modules.mp.service; import cn.binarywang.wx.miniapp.bean.WxMaLiveResult; import co.yixiang.common.service.BaseService; +import co.yixiang.modules.mp.service.dto.UpdateGoodsDto; import co.yixiang.modules.mp.service.dto.WxMaLiveInfo; import co.yixiang.modules.mp.service.dto.YxWechatLiveDto; import co.yixiang.modules.mp.service.dto.YxWechatLiveQueryCriteria; @@ -94,4 +95,6 @@ public interface YxWechatLiveService extends BaseService{ * @return List */ List getList(int page, int limit, int order); + + boolean addGoods(UpdateGoodsDto resources); } diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/UpdateGoodsDto.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/UpdateGoodsDto.java new file mode 100644 index 00000000..5d645fde --- /dev/null +++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/dto/UpdateGoodsDto.java @@ -0,0 +1,11 @@ +package co.yixiang.modules.mp.service.dto; + +import lombok.Data; + +@Data +public class UpdateGoodsDto { + + private Integer roomId; + + private String productId; +} diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java index cabd03b3..4eaeb6a3 100644 --- a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java +++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java @@ -21,10 +21,7 @@ import co.yixiang.exception.BadRequestException; import co.yixiang.modules.mp.domain.YxWechatLiveGoods; import co.yixiang.modules.mp.service.YxWechatLiveGoodsService; import co.yixiang.modules.mp.service.YxWechatLiveService; -import co.yixiang.modules.mp.service.dto.WxMaLiveInfo; -import co.yixiang.modules.mp.service.dto.YxWechatLiveDto; -import co.yixiang.modules.mp.service.dto.YxWechatLiveGoodsDto; -import co.yixiang.modules.mp.service.dto.YxWechatLiveQueryCriteria; +import co.yixiang.modules.mp.service.dto.*; import co.yixiang.modules.mp.service.mapper.YxWechatLiveMapper; import co.yixiang.modules.mp.vo.WechatLiveVo; import co.yixiang.modules.mp.domain.YxWechatLive; @@ -136,6 +133,30 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl pids = new ArrayList<>(); + for (String productId : productIds) { + pids.add(Integer.valueOf(productId)); + } + //添加商品 + try { + wxMaService.getLiveService().addGoodsToRoom(resources.getRoomId().intValue(), pids); + this.saveOrUpdate(wechatLive); + } catch (WxErrorException e) { + e.printStackTrace(); + } + } + return true; + } @Override public boolean saveLive(YxWechatLive resources){ WxMaService wxMaService = WxMaConfiguration.getWxMaService(); @@ -259,4 +280,6 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl