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

店铺流水相关代码优化，流水与结算单业务隔离。

Browse Source 
相关方法进行优化，迁移。
This commit is contained in:
Chopper
2021-11-30 16:57:19 +08:00
parent bea807c7b4
commit 6184ba9b82
17 changed files with 67 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ import cn.lili.modules.member.entity.dto.MemberAddDTO;
import cn.lili.modules.member.entity.vo.MemberSearchVO;
import cn.lili.modules.member.entity.vo.MemberVO;
import cn.lili.modules.member.service.MemberService;
import cn.lili.modules.system.aspect.annotation.DemoSite;
import cn.lili.common.aop.annotation.DemoSite;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;

2
manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java → manager-api/src/main/java/cn/lili/controller/message/MemberMessageManagerController.java
View File

@@ -1,4 +1,4 @@
package cn.lili.controller.member;
package cn.lili.controller.message;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;

2
manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java → manager-api/src/main/java/cn/lili/controller/message/MemberNoticeLogManagerController.java
View File

@@ -1,4 +1,4 @@
package cn.lili.controller.member;
package cn.lili.controller.message;
import cn.lili.common.enums.ResultUtil;
import cn.lili.mybatis.util.PageUtil;

2
manager-api/src/main/java/cn/lili/controller/member/MemberNoticeManagerController.java → manager-api/src/main/java/cn/lili/controller/message/MemberNoticeManagerController.java
View File

@@ -1,4 +1,4 @@
package cn.lili.controller.member;
package cn.lili.controller.message;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.security.context.UserContext;

2
manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java → manager-api/src/main/java/cn/lili/controller/message/MemberNoticeSenterManagerController.java
View File

@@ -1,4 +1,4 @@
package cn.lili.controller.member;
package cn.lili.controller.message;
import cn.lili.common.enums.ResultUtil;
import cn.lili.mybatis.util.PageUtil;

6
manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java
View File

@@ -4,6 +4,7 @@ import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
import cn.lili.modules.order.order.entity.dos.StoreFlow;
import cn.lili.modules.order.order.service.StoreFlowService;
import cn.lili.modules.store.entity.dos.Bill;
import cn.lili.modules.store.entity.dto.BillSearchParams;
import cn.lili.modules.store.entity.vos.BillListVO;
@@ -31,6 +32,9 @@ public class BillManagerController {
@Autowired
private BillService billService;
@Autowired
private StoreFlowService storeFlowService;
@ApiOperation(value = "通过id获取结算单")
@ApiImplicitParam(name = "id", value = "结算单ID", required = true, paramType = "path")
@GetMapping(value = "/get/{id}")
@@ -51,7 +55,7 @@ public class BillManagerController {
})
@GetMapping(value = "/{id}/getStoreFlow")
public ResultMessage<IPage<StoreFlow>> getStoreFlow(@PathVariable String id, String flowType, PageVO pageVO) {
return ResultUtil.data(billService.getStoreFlow(id, flowType, pageVO));
return ResultUtil.data(storeFlowService.getStoreFlow(id, flowType, pageVO));
}
@ApiOperation(value = "支付结算单")