From a4f2800ee70f40d4bcec737a913c0bc4108a0a46 Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Wed, 12 Aug 2020 00:23:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rest/YxWechatLiveGoodsController.java | 8 ++-- .../service/YxWechatLiveGoodsService.java | 4 ++ .../wechat/service/dto/YxWechatLiveDto.java | 4 ++ .../service/dto/YxWechatLiveGoodsDto.java | 3 ++ .../impl/YxWechatLiveGoodsServiceImpl.java | 40 ++++++++++++++++++- .../service/impl/YxWechatLiveServiceImpl.java | 8 +++- 6 files changed, 62 insertions(+), 5 deletions(-) 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 0c7b2d00..694aade3 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 @@ -9,12 +9,14 @@ package co.yixiang.modules.wechat.rest; import java.util.Arrays; import co.yixiang.dozer.service.IGenerator; +import co.yixiang.modules.wechat.service.WxMaLiveGoodsService; import lombok.AllArgsConstructor; import co.yixiang.logging.aop.log.Log; import co.yixiang.modules.wechat.domain.YxWechatLiveGoods; import co.yixiang.modules.wechat.service.YxWechatLiveGoodsService; import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsQueryCriteria; import co.yixiang.modules.wechat.service.dto.YxWechatLiveGoodsDto; +import me.chanjar.weixin.common.error.WxErrorException; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -37,7 +39,7 @@ public class YxWechatLiveGoodsController { private final YxWechatLiveGoodsService yxWechatLiveGoodsService; private final IGenerator generator; - + private final WxMaLiveGoodsService wxMaLiveGoodsService; @Log("导出数据") @ApiOperation("导出数据") @@ -68,7 +70,7 @@ public class YxWechatLiveGoodsController { @ApiOperation("修改yxWechatLiveGoods") @PreAuthorize("@el.check('admin','yxWechatLiveGoods:edit')") public ResponseEntity update(@Validated @RequestBody YxWechatLiveGoods resources){ - yxWechatLiveGoodsService.updateById(resources); + yxWechatLiveGoodsService.updategoods(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -78,7 +80,7 @@ public class YxWechatLiveGoodsController { @DeleteMapping public ResponseEntity deleteAll(@RequestBody Long[] ids) { Arrays.asList(ids).forEach(id->{ - yxWechatLiveGoodsService.removeById(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 e90cc308..41f75f8c 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 @@ -49,4 +49,8 @@ public interface YxWechatLiveGoodsService extends BaseService goodsIds); + + void removegoods(Long id); + + void updategoods(YxWechatLiveGoods resources); } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java index b03bd659..dd9e4793 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveDto.java @@ -20,11 +20,15 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @Data public class YxWechatLiveDto implements Serializable { + + /** 直播间id */ /** 防止精度丢失 */ @JsonSerialize(using= ToStringSerializer.class) private Long roomid; + private Long id; + /** 直播间标题 */ private String name; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsDto.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsDto.java index 2b4c4c5f..56bebf1a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/dto/YxWechatLiveGoodsDto.java @@ -20,6 +20,9 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @Data public class YxWechatLiveGoodsDto implements Serializable { + + private Long id; + /** 直播商品id */ /** 防止精度丢失 */ @JsonSerialize(using= ToStringSerializer.class) 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 bf2604ed..4d5db68e 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 @@ -9,6 +9,7 @@ package co.yixiang.modules.wechat.service.impl; 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.exception.BadRequestException; @@ -87,13 +88,50 @@ public class YxWechatLiveGoodsServiceImpl extends BaseServiceImpl queryAll(YxWechatLiveGoodsQueryCriteria criteria, Pageable pageable) { getPage(pageable); PageInfo page = new PageInfo<>(queryAll(criteria)); Map map = new LinkedHashMap<>(2); - map.put("content", generator.convert(page.getList(), YxWechatLiveGoodsDto.class)); + List goodsDtos = generator.convert(page.getList(), YxWechatLiveGoodsDto.class); + goodsDtos.forEach(i ->{ + i.setId(i.getGoodsId()); + }); + map.put("content",goodsDtos); map.put("totalElements", page.getTotal()); return map; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java index 8692789b..e3135d67 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java @@ -11,6 +11,7 @@ package co.yixiang.modules.wechat.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONUtil; +import co.yixiang.exception.BadRequestException; import co.yixiang.modules.wechat.domain.YxWechatLive; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.dozer.service.IGenerator; @@ -96,7 +97,11 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl page = new PageInfo<>(queryAll(criteria)); Map map = new LinkedHashMap<>(2); // List liveInfos = wxMaLiveService.getLiveInfos(); - map.put("content", generator.convert(page.getList(), YxWechatLiveDto.class)); + List liveDtos = generator.convert(page.getList(), YxWechatLiveDto.class); + liveDtos.forEach(i ->{ + i.setId(i.getRoomid()); + }); + map.put("content",liveDtos); map.put("totalElements", page.getTotal()); return map; } @@ -115,6 +120,7 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl