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
seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java → seller-api/src/main/java/cn/lili/controller/message/StoreMessageController.java
View File

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

12
seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java
View File

@@ -6,6 +6,7 @@ import cn.lili.common.security.context.UserContext;
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;
@@ -36,6 +37,9 @@ public class BillStoreController {
@Autowired
private BillService billService;
@Autowired
private StoreFlowService storeFlowService;
@ApiOperation(value = "获取结算单分页")
@GetMapping(value = "/getByPage")
public ResultMessage<IPage<BillListVO>> getByPage(BillSearchParams billSearchParams) {
@@ -59,7 +63,7 @@ public class BillStoreController {
@GetMapping(value = "/{id}/getStoreFlow")
public ResultMessage<IPage<StoreFlow>> getStoreFlow(@PathVariable String id, String flowType, PageVO pageVO) {
OperationalJudgment.judgment(billService.getById(id));
return ResultUtil.data(billService.getStoreFlow(id, flowType, pageVO));
return ResultUtil.data(storeFlowService.getStoreFlow(id, flowType, pageVO));
}
@ApiOperation(value = "获取商家分销订单流水分页")
@@ -69,7 +73,7 @@ public class BillStoreController {
@GetMapping(value = "/{id}/getDistributionFlow")
public ResultMessage<IPage<StoreFlow>> getDistributionFlow(@PathVariable String id, PageVO pageVO) {
OperationalJudgment.judgment(billService.getById(id));
return ResultUtil.data(billService.getDistributionFlow(id, pageVO));
return ResultUtil.data(storeFlowService.getDistributionFlow(id, pageVO));
}
@ApiOperation(value = "核对结算单")
@@ -81,13 +85,13 @@ public class BillStoreController {
return ResultUtil.success();
}
@ApiOperation(value = "下载结算单",produces="application/octet-stream")
@ApiOperation(value = "下载结算单", produces = "application/octet-stream")
@ApiImplicitParam(name = "id", value = "结算单ID", required = true, paramType = "path", dataType = "String")
@GetMapping(value = "/downLoad/{id}")
public void downLoadDeliverExcel(@PathVariable String id) {
OperationalJudgment.judgment(billService.getById(id));
HttpServletResponse response = ThreadContextHolder.getHttpResponse();
billService.download(response,id);
billService.download(response, id);
}