diff --git a/yshop-common/src/main/java/co/yixiang/enums/LiveGoodsEnum.java b/yshop-common/src/main/java/co/yixiang/enums/LiveGoodsEnum.java new file mode 100644 index 00000000..52a76e26 --- /dev/null +++ b/yshop-common/src/main/java/co/yixiang/enums/LiveGoodsEnum.java @@ -0,0 +1,27 @@ +/** + * Copyright (C) 2018-2020 + * All rights reserved, Designed By www.yixiang.co + + */ +package co.yixiang.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * @author hupeng + * 直播商品相关枚举 + */ +@Getter +@AllArgsConstructor +public enum LiveGoodsEnum { + + IS_Audit_0(0,"未审核"), + IS_Audit_1(1,"审核中"), + IS_Audit_2(2,"审核通过"), + IS_Audit_3(3,"审核失败"); + + private Integer value; + private String desc; + +} diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java index 694aade3..77d8dc0b 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java @@ -70,7 +70,7 @@ public class YxWechatLiveGoodsController { @ApiOperation("修改yxWechatLiveGoods") @PreAuthorize("@el.check('admin','yxWechatLiveGoods:edit')") public ResponseEntity update(@Validated @RequestBody YxWechatLiveGoods resources){ - yxWechatLiveGoodsService.updategoods(resources); + yxWechatLiveGoodsService.updateGoods(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -80,7 +80,7 @@ public class YxWechatLiveGoodsController { @DeleteMapping public ResponseEntity deleteAll(@RequestBody Long[] ids) { Arrays.asList(ids).forEach(id->{ - yxWechatLiveGoodsService.removegoods(id); + yxWechatLiveGoodsService.removeGoods(id); }); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveGoodsService.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveGoodsService.java index 41f75f8c..7290ff1f 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveGoodsService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveGoodsService.java @@ -46,11 +46,29 @@ public interface YxWechatLiveGoodsService extends BaseService all, HttpServletResponse response) throws IOException; + /** + * 保存直播商品信息 + * @param resources + * @return + */ boolean saveGoods(YxWechatLiveGoods resources); + /** + * 同步商品更新审核状态 + * @param goodsIds + * @return + */ boolean synchroWxOlLive(List goodsIds); - void removegoods(Long id); + /** + * 根据id删除直播商品信息 + * @param id + */ + void removeGoods(Long id); - void updategoods(YxWechatLiveGoods resources); + /** + * 更新直播商品信息 + * @param resources + */ + void updateGoods(YxWechatLiveGoods resources); } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java index 570c6aea..36ede6fe 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java @@ -26,9 +26,13 @@ public interface YxWechatLiveService extends BaseService{ - + /** + * 同步直播间 + * @return + */ boolean synchroWxOlLive(); -/** + + /** * 查询数据分页 * @param criteria 条件 * @param pageable 分页参数 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/WxMaLiveGoodsServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/WxMaLiveGoodsServiceImpl.java index c3b9d281..da0d4616 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/WxMaLiveGoodsServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/WxMaLiveGoodsServiceImpl.java @@ -146,7 +146,7 @@ public class WxMaLiveGoodsServiceImpl implements WxMaLiveGoodsService { * @throws WxErrorException */ private WxMediaUploadResult uploadPhotoToWx(WxMaService wxMaService, String picPath) throws WxErrorException { - String filename = String.valueOf( (int)System.currentTimeMillis() ) + ".png"; + String filename = (int) System.currentTimeMillis() + ".png"; String downloadPath = uploadDirStr + filename; long size = HttpUtil.downloadFile(picPath, cn.hutool.core.io.FileUtil.file(downloadPath)); picPath = downloadPath; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveGoodsServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveGoodsServiceImpl.java index 4d5db68e..efa314b3 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveGoodsServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveGoodsServiceImpl.java @@ -12,8 +12,8 @@ import cn.binarywang.wx.miniapp.api.WxMaService; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; +import co.yixiang.enums.LiveGoodsEnum; import co.yixiang.exception.BadRequestException; -import co.yixiang.modules.wechat.domain.YxWechatLive; import co.yixiang.modules.wechat.domain.YxWechatLiveGoods; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.dozer.service.IGenerator; @@ -75,6 +75,7 @@ public class YxWechatLiveGoodsServiceImpl extends BaseServiceImpl goodsIds) { try { WxMaLiveResult liveInfos = wxMaLiveGoodsService.getGoodsWareHouse(goodsIds); @@ -90,7 +91,7 @@ public class YxWechatLiveGoodsServiceImpl extends BaseServiceImpl + */ @Override //@Cacheable public Map queryAll(YxWechatLiveGoodsQueryCriteria criteria, Pageable pageable) { @@ -136,14 +148,23 @@ public class YxWechatLiveGoodsServiceImpl extends BaseServiceImpl + */ @Override //@Cacheable public List queryAll(YxWechatLiveGoodsQueryCriteria criteria){ return baseMapper.selectList(QueryHelpPlus.getPredicate(YxWechatLiveGoods.class, criteria)); } - + /** + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ @Override public void download(List all, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); @@ -164,6 +185,11 @@ public class YxWechatLiveGoodsServiceImpl extends BaseServiceImpl liveInfos = wxMaLiveService.getLiveInfos(); @@ -163,7 +164,7 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl