cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改一些bug

Browse Source
This commit is contained in:
xuwenbo
2020-05-13 09:27:25 +08:00
parent 33db98681d
commit b26f976a46
6 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java
View File

@ -42,7 +42,7 @@ public class WechatMenuController {
@GetMapping(value = "/YxWechatMenu") @GetMapping(value = "/YxWechatMenu")
@PreAuthorize("@el.check('admin','YxWechatMenu_ALL','YxWechatMenu_SELECT')") @PreAuthorize("@el.check('admin','YxWechatMenu_ALL','YxWechatMenu_SELECT')")
public ResponseEntity getYxWechatMenus(){ public ResponseEntity getYxWechatMenus(){
return new ResponseEntity(YxWechatMenuService.getOne(new QueryWrapper<YxWechatMenu>().eq("key","wechat_menus")),HttpStatus.OK); return new ResponseEntity(YxWechatMenuService.getOne(new QueryWrapper<YxWechatMenu>().eq("`key`","wechat_menus")),HttpStatus.OK);
} }

10
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/ChartDataDTO.java
View File

@ -1,14 +1,16 @@
package co.yixiang.modules.shop.service.dto; package co.yixiang.modules.shop.service.dto;
import lombok.Data;
/** /**
* @ClassName ChartDataDTO * @ClassName ChartDataDTO
* @Author hupeng <610796224@qq.com> * @Author hupeng <610796224@qq.com>
* @Date 2019/11/25 * @Date 2019/11/25
**/ **/
//@Data @Data
public interface ChartDataDTO{ public class ChartDataDTO{
// @Value("#{target.adminCount}") // @Value("#{target.adminCount}")
Double getNum(); private Double num;
String getTime(); private String time;
} }

6
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/CountDto.java
View File

@ -2,8 +2,8 @@ package co.yixiang.modules.shop.service.dto;
import lombok.Data; import lombok.Data;
//@Data @Data
public interface CountDto { public class CountDto {
String getCatename(); private String catename;
} }

6
yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java
View File

@ -49,13 +49,13 @@ public class YxStoreOrderQueryCriteria{
@Query @Query
private Integer bargainId; private Integer bargainId;
@Query(propName="combinationId",type = Query.Type.NOT_EQUAL) @Query(propName="combination_id",type = Query.Type.NOT_EQUAL)
private Integer newCombinationId; private Integer newCombinationId;
@Query(propName="seckillId",type = Query.Type.NOT_EQUAL) @Query(propName="seckill_id",type = Query.Type.NOT_EQUAL)
private Integer newSeckillId; private Integer newSeckillId;
@Query(propName="bargainId",type = Query.Type.NOT_EQUAL) @Query(propName="bargain_id",type = Query.Type.NOT_EQUAL)
private Integer newBargainId; private Integer newBargainId;
@Query @Query

2
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java
View File

@ -197,7 +197,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<YxStoreOrderMapper,
} }
Map<String, Object> map = new LinkedHashMap<>(2); Map<String, Object> map = new LinkedHashMap<>(2);
map.put("content", generator.convert(page.getList(), YxStoreOrderDto.class)); map.put("content", storeOrderDTOS);
map.put("totalElements", page.getTotal()); map.put("totalElements", page.getTotal());
return map; return map;
} }

14
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java
View File

@ -2,6 +2,7 @@ package co.yixiang.modules.shop.service.impl;
import co.yixiang.modules.shop.domain.YxSystemGroupData; import co.yixiang.modules.shop.domain.YxSystemGroupData;
import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.service.impl.BaseServiceImpl;
import com.alibaba.fastjson.JSON;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import co.yixiang.dozer.service.IGenerator; import co.yixiang.dozer.service.IGenerator;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
@ -49,8 +50,15 @@ public class YxSystemGroupDataServiceImpl extends BaseServiceImpl<YxSystemGroupD
getPage(pageable); getPage(pageable);
PageInfo<YxSystemGroupData> page = new PageInfo<>(queryAll(criteria)); PageInfo<YxSystemGroupData> page = new PageInfo<>(queryAll(criteria));
Map<String, Object> map = new LinkedHashMap<>(2); Map<String, Object> map = new LinkedHashMap<>(2);
map.put("content", generator.convert(page.getList(), YxSystemGroupDataDto.class)); List<YxSystemGroupDataDto> systemGroupDataDTOS = new ArrayList<>();
map.put("totalElements", page.getTotal()); 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; return map;
} }
@ -76,4 +84,4 @@ public class YxSystemGroupDataServiceImpl extends BaseServiceImpl<YxSystemGroupD
} }
FileUtil.downloadExcel(list, response); FileUtil.downloadExcel(list, response);
} }
} }