Browse Source

no message

FengChaoYu 9 months ago
parent
commit
504a5fdae3

+ 3 - 3
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/parts/NewRefundController.java

@@ -32,8 +32,8 @@ public class NewRefundController {
     @Resource
     RedisLockRegistry redisLockRegistry;
 
-    @GetMapping("/list")
     @ApiOperation(value = "新件返还管理列表")
+    @PostMapping("/list")
     public ResponseHelper<IPage<NewRefundManageBean>> appList(
             @ApiParam(value = "申请单号") @RequestParam(required = false) String applyNo,
             @ApiParam(value = "单据状态 SAVE=保存 SUBMIT=提交 AGREE=通过 REJECT=驳回 REFUNDED=已返还") @RequestParam(required = false) String flag,
@@ -45,16 +45,16 @@ public class NewRefundController {
         return ResponseHelper.success(newRefundManageLogic.appList(applyNo, flag, identity, partsNumber, pageNo, pageSize));
     }
 
-    @GetMapping("/detail")
     @ApiOperation(value = "新件返还管理详情")
+    @PostMapping("/detail")
     public ResponseHelper<NewRefundManageBean> detail(
             @ApiParam(value = "申请单号",required = true) @RequestParam String applyNo
     ) throws RemoteServiceException {
         return ResponseHelper.success(newRefundManageLogic.detail(applyNo));
     }
 
-    @PostMapping("/add")
     @ApiOperation(value = "新件返还申请")
+    @PostMapping("/add")
     public ResponseHelper add(
             @RequestBody NewRefundManageBean newRefundManageBean
     ) throws Exception {

+ 9 - 7
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/material/parts/SalesOrderController.java

@@ -36,8 +36,8 @@ public class SalesOrderController {
     @Resource
     RedisLockRegistry redisLockRegistry;
 
-    @GetMapping("/exist/websit/list")
     @ApiOperation(value = "查询师傅未转销售订单网点")
+    @PostMapping("/exist/websit/list")
     public ResponseHelper<List<AdminWebsit>> existWebsitList (
             @ApiParam(value = "师傅身份证",required = true) @RequestParam String identity,
             @ApiParam(value = "网点编号") @RequestParam(required = false) String websitId
@@ -45,8 +45,9 @@ public class SalesOrderController {
         return ResponseHelper.success(websitPartsSalesLogic.existWebsitList(identity, websitId));
     }
 
-    @GetMapping("/list")
+
     @ApiOperation(value = "销售订单列表")
+    @PostMapping("/list")
     public ResponseHelper<IPage<PartsSalesOrderBean>> appList(
             @ApiParam(value = "师傅身份证", required = true) @RequestParam String identity,
             @ApiParam(value = "销售订单号") @RequestParam(required = false) String salesId,
@@ -59,8 +60,8 @@ public class SalesOrderController {
         return ResponseHelper.success(websitPartsSalesLogic.appList(identity, salesId, status, pushFlag, partsNumber, pageNo, pageSize));
     }
 
-    @GetMapping("/detail")
     @ApiOperation(value = "销售订单详情")
+    @PostMapping("/detail")
     public ResponseHelper<IPage<PartsSalesOrderBean>> appDetail(
             @ApiParam(value = "师傅身份证", required = true) @RequestParam String identity,
             @ApiParam(value = "销售订单号", required = true) @RequestParam String salesId,
@@ -70,8 +71,9 @@ public class SalesOrderController {
     }
 
 
-    @PostMapping("/add")
+
     @ApiOperation("配件销售单新增")
+    @PostMapping("/add")
     public ResponseHelper<PartsSalesOrderBean> add(
             @RequestBody PartsSalesOrderBean partsSalesOrderBean
     ) throws RemoteServiceException {
@@ -84,7 +86,7 @@ public class SalesOrderController {
     }
 
     @ApiOperation("配件销售单根据id获取")
-    @GetMapping("/loadSalesOrderById")
+    @PostMapping("/loadSalesOrderById")
     public ResponseHelper<PartsSalesOrderBean> loadSalesOrderById(
             @RequestParam String id
     ) throws RemoteServiceException {
@@ -92,7 +94,7 @@ public class SalesOrderController {
     }
 
     @ApiOperation("提交订单")
-    @GetMapping("/submit")
+    @PostMapping("/submit")
     public ResponseHelper<PartsSalesOrderBean> submit(@ApiParam(value = "销售单id",required = true) @RequestParam String id) throws InterruptedException {
         Lock obtain = redisLockRegistry.obtain(Constant.RedisPrefix.PARTS_SALES + id);
         if (!obtain.tryLock(10, TimeUnit.SECONDS)) {
@@ -109,7 +111,7 @@ public class SalesOrderController {
     }
     
     @ApiOperation("师傅提货")
-	@GetMapping("/workerConfirmDelivery")
+	@PostMapping("/workerConfirmDelivery")
 	public ResponseHelper workerConfirmDelivery(
 			@ApiParam(value = "销售单号",required = true) @RequestParam String id
 			) throws Exception {

+ 6 - 6
mall-server-api/src/main/java/com/gree/mall/manager/bean/material/manage/WebsitPartsNewInVO.java

@@ -69,22 +69,22 @@ public class WebsitPartsNewInVO {
     private String receiveUnit;
 
     @ApiModelProperty("发出网点编号")
-    private String sendShopId;
+    private String sendWebsitId;
 
     @ApiModelProperty("发出网点名称")
-    private String sendShopName;
+    private String sendWebsitName;
 
     @ApiModelProperty("发出配件网点编号")
-    private String sendPartsWebsiteNumber;
+    private String sendPartsWebsitId;
 
     @ApiModelProperty("领入网点编号")
-    private String receiveShopId;
+    private String receiveWebsitId;
 
     @ApiModelProperty("领入网点名称")
-    private String receiveShopName;
+    private String receiveWebsitName;
 
     @ApiModelProperty("领入配件网点编号")
-    private String receivePartsWebsiteNumber;
+    private String receivePartsWebsitId;
 
     @ApiModelProperty("开单日期")
     private Date orderDate;