code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'backup'

Browse Source 
# Conflicts:
#	manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
#	manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
#	manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
#	manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
#	manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
#	manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
This commit is contained in:
Chopper
2021-07-25 17:51:05 +08:00
parent f9d7e9324a 0514bec994
commit fe8523ca3f
17 changed files with 163 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
View File

@@ -3,6 +3,7 @@ package cn.lili.controller.member;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.aspect.annotation.DemoSite;
import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dto.ManagerMemberEditDTO;
import cn.lili.modules.member.entity.dto.MemberAddDTO;

1
manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
View File

@@ -3,6 +3,7 @@ package cn.lili.controller.other;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.aspect.annotation.DemoSite;
import cn.lili.modules.page.entity.dos.PageData;
import cn.lili.modules.page.entity.dto.PageDataDTO;
import cn.lili.modules.page.entity.vos.PageDataListVO;

1
manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
View File

@@ -10,6 +10,7 @@ import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.common.vo.SearchVO;
import cn.lili.modules.system.aspect.annotation.DemoSite;
import cn.lili.modules.permission.entity.dos.AdminUser;
import cn.lili.modules.permission.entity.dto.AdminUserDTO;
import cn.lili.modules.permission.entity.vo.AdminUserVO;

1
manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
View File

@@ -2,6 +2,7 @@ package cn.lili.controller.permission;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.aspect.annotation.DemoSite;
import cn.lili.modules.permission.entity.dos.Menu;
import cn.lili.modules.permission.entity.dto.MenuSearchParams;
import cn.lili.modules.permission.entity.vo.MenuVO;

47
manager-api/src/main/java/cn/lili/controller/setting/HotWordsManagerController.java Executable file
View File

@@ -0,0 +1,47 @@
package cn.lili.controller.setting;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.search.service.EsGoodsSearchService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 管理端,app版本控制器
*
* @author Chopper
* @since 2018-07-04 21:50:52
*/
@RestController
@Api(tags = "管理端,系统设置扩展接口")
@RequestMapping("/manager/hotwords")
public class HotWordsManagerController {
@Autowired
private EsGoodsSearchService esGoodsSearchService;
@ApiOperation(value = "获取热词")
@GetMapping
public ResultMessage getHotWords() {
return ResultUtil.data(esGoodsSearchService.getHotWords(0, 99));
}
@ApiOperation(value = "设置热词")
@ApiImplicitParams({
@ApiImplicitParam(name = "keywords", value = "关键字"),
@ApiImplicitParam(name = "point", value = "权重值")
})
@PostMapping
public ResultMessage paymentForm(String keywords, Integer point) {
esGoodsSearchService.setHotWords(keywords, point);
return ResultUtil.success();
}
}

1
manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java
View File

@@ -39,7 +39,6 @@ public class InstantDeliveryManagerController {
IPage<InstantDelivery> data = instantDeliveryService.page(PageUtil.initPage(page));
//组织数据结构
IPage<InstantDeliveryVO> newData = instantDeliveryService.getInstantDeliveryPage(data, page);
System.out.println();
//返回数据
return ResultUtil.data(newData);
}

2
manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
View File

@@ -3,8 +3,8 @@ package cn.lili.controller.setting;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.aspect.annotation.DemoSite;
import cn.lili.modules.system.entity.dos.Region;
import cn.lili.modules.system.service.RegionService;
import cn.lili.modules.system.entity.dos.Region;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;

1
manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
View File

@@ -3,6 +3,7 @@ package cn.lili.controller.store;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.system.aspect.annotation.DemoSite;
import cn.lili.modules.goods.entity.vos.CategoryVO;
import cn.lili.modules.store.entity.dos.Store;
import cn.lili.modules.store.entity.dto.AdminStoreApplyDTO;