From 95f9ea7eb339c36cade6c67d0385c49ec2d81477 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 14 Apr 2021 19:39:45 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java |   92 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 92 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java
new file mode 100644
index 0000000..5c511b7
--- /dev/null
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoOrderAction.java
@@ -0,0 +1,92 @@
+package com.matrix.system.fenxiao.action;
+
+import com.matrix.core.pojo.AjaxResult;
+import com.matrix.system.fenxiao.dto.LoadFenxiaoOrderBasicDto;
+import com.matrix.system.fenxiao.dto.LoadFenxiaoOrderListDto;
+import com.matrix.system.fenxiao.dto.LoadSetOrderListDtoDto;
+import com.matrix.system.fenxiao.dto.UpdateSetOrderDoneDto;
+import com.matrix.system.fenxiao.service.ShopSalesmanOrderService;
+import com.matrix.system.fenxiao.vo.LoadFenxiaoOrderBasicVo;
+import com.matrix.system.fenxiao.vo.LoadFenxiaoOrderListVo;
+import com.matrix.system.fenxiao.vo.LoadSetOrderListDtoVo;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping(value = "/fenXiao/fenXiaoOrder")
+public class FenXiaoOrderAction {
+	
+	@Autowired
+    private ShopSalesmanOrderService shopSalesmanOrderService;
+	
+	/**
+     * 分销订单基本信息
+     */
+    @ApiOperation(value = "分销订单基本信息")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK",  response = LoadFenxiaoOrderBasicVo.class)
+    })
+    @PostMapping(value = "/loadFenxiaoOrderBasic")
+    public @ResponseBody
+    AjaxResult loadFenxiaoOrderBasic(@RequestBody LoadFenxiaoOrderBasicDto loadFenxiaoOrderBasicDto) {
+    	return shopSalesmanOrderService.loadFenxiaoOrderBasic(loadFenxiaoOrderBasicDto);
+    }
+    
+    /**
+     * 分销订单
+     */
+    @ApiOperation(value = "分销订单")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK",  response = LoadFenxiaoOrderListVo.class)
+    })
+    @PostMapping(value = "/loadFenxiaoOrderList")
+    public @ResponseBody
+    AjaxResult loadFenxiaoOrderList(@RequestBody LoadFenxiaoOrderListDto loadFenxiaoOrderListDto) {
+    	return shopSalesmanOrderService.loadFenxiaoOrderList(loadFenxiaoOrderListDto);
+    }
+    
+    /**
+     *批量结算分销订单
+     */
+    @ApiOperation(value = "批量结算分销订单")
+    @PostMapping(value = "/updateSetOrderDone")
+    public @ResponseBody
+    AjaxResult updateSetOrderDone(@RequestBody UpdateSetOrderDoneDto updateSetOrderDoneDto) {
+    	return shopSalesmanOrderService.updateSetOrderDone(updateSetOrderDoneDto);
+    }
+    
+    /**
+     * 结算记录
+     */
+    @ApiOperation(value = "结算记录")
+    @ApiResponses({
+    	@ApiResponse(code = 200, message = "OK",  response = LoadSetOrderListDtoVo.class)
+    })
+    @PostMapping(value = "/loadSetOrderList")
+    public @ResponseBody
+    AjaxResult loadSetOrderList(@RequestBody LoadSetOrderListDtoDto loadSetOrderListDto) {
+    	return shopSalesmanOrderService.loadSetOrderList(loadSetOrderListDto);
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+}

--
Gitblit v1.9.1