From b26f976a46baa2a26b6fd919e5c0229e64dee8fb Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Wed, 13 May 2020 09:27:25 +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 --- .../mp/controller/WechatMenuController.java | 2 +- .../modules/shop/service/dto/ChartDataDTO.java | 10 ++++++---- .../yixiang/modules/shop/service/dto/CountDto.java | 6 +++--- .../service/dto/YxStoreOrderQueryCriteria.java | 6 +++--- .../shop/service/impl/YxStoreOrderServiceImpl.java | 2 +- .../service/impl/YxSystemGroupDataServiceImpl.java | 14 +++++++++++--- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java index 8b066b57..e354b2d8 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java @@ -42,7 +42,7 @@ public class WechatMenuController { @GetMapping(value = "/YxWechatMenu") @PreAuthorize("@el.check('admin','YxWechatMenu_ALL','YxWechatMenu_SELECT')") public ResponseEntity getYxWechatMenus(){ - return new ResponseEntity(YxWechatMenuService.getOne(new QueryWrapper().eq("key","wechat_menus")),HttpStatus.OK); + return new ResponseEntity(YxWechatMenuService.getOne(new QueryWrapper().eq("`key`","wechat_menus")),HttpStatus.OK); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDTO.java index 51395e76..3fbc5270 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDTO.java @@ -1,14 +1,16 @@ package co.yixiang.modules.shop.service.dto; +import lombok.Data; + /** * @ClassName ChartDataDTO * @Author hupeng <610796224@qq.com> * @Date 2019/11/25 **/ -//@Data -public interface ChartDataDTO{ +@Data +public class ChartDataDTO{ // @Value("#{target.adminCount}") - Double getNum(); - String getTime(); + private Double num; + private String time; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/CountDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/CountDto.java index a2e8a612..62a0cf03 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/CountDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/CountDto.java @@ -2,8 +2,8 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; -//@Data -public interface CountDto { +@Data +public class CountDto { - String getCatename(); + private String catename; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java index 7ca51c7b..89663fda 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java @@ -49,13 +49,13 @@ public class YxStoreOrderQueryCriteria{ @Query private Integer bargainId; - @Query(propName="combinationId",type = Query.Type.NOT_EQUAL) + @Query(propName="combination_id",type = Query.Type.NOT_EQUAL) private Integer newCombinationId; - @Query(propName="seckillId",type = Query.Type.NOT_EQUAL) + @Query(propName="seckill_id",type = Query.Type.NOT_EQUAL) private Integer newSeckillId; - @Query(propName="bargainId",type = Query.Type.NOT_EQUAL) + @Query(propName="bargain_id",type = Query.Type.NOT_EQUAL) private Integer newBargainId; @Query diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java index 2de904ec..5153ca7f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java @@ -197,7 +197,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl map = new LinkedHashMap<>(2); - map.put("content", generator.convert(page.getList(), YxStoreOrderDto.class)); + map.put("content", storeOrderDTOS); map.put("totalElements", page.getTotal()); return map; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java index af2dcc11..4a5c3794 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java @@ -2,6 +2,7 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxSystemGroupData; import co.yixiang.common.service.impl.BaseServiceImpl; +import com.alibaba.fastjson.JSON; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; import com.github.pagehelper.PageHelper; @@ -49,8 +50,15 @@ public class YxSystemGroupDataServiceImpl extends BaseServiceImpl page = new PageInfo<>(queryAll(criteria)); Map map = new LinkedHashMap<>(2); - map.put("content", generator.convert(page.getList(), YxSystemGroupDataDto.class)); - map.put("totalElements", page.getTotal()); + List systemGroupDataDTOS = new ArrayList<>(); + for (YxSystemGroupData systemGroupData : page.getList()) { + + YxSystemGroupDataDto systemGroupDataDTO = generator.convert(systemGroupData,YxSystemGroupDataDto.class); + systemGroupDataDTO.setMap(JSON.parseObject(systemGroupData.getValue())); + systemGroupDataDTOS.add(systemGroupDataDTO); + } + map.put("content",systemGroupDataDTOS); + map.put("totalElements",page.getTotal()); return map; } @@ -76,4 +84,4 @@ public class YxSystemGroupDataServiceImpl extends BaseServiceImpl