修改销售订单退货成功时状态为退货退款

src/main/java/orthopedics/controller/bookcity/WshShipmentController.java

@@ -61,8 +61,12 @@ public class WshShipmentController {
     public Result createShip(@RequestBody WshShipmentHeaderPage wshShipmentHeaderPage,
     public Result createShip(@RequestBody WshShipmentHeaderPage wshShipmentHeaderPage,
                              @RequestParam(value = "status",required = true)String status,
                              @RequestParam(value = "status",required = true)String status,
                              @RequestParam(value = "token",required = true)String token){
                              @RequestParam(value = "token",required = true)String token){
+        SalOrderHeader salOrderHeader = salOrderHeaderService.findSalOrderById(wshShipmentHeaderPage.getSourceHeaderId());
+        if(salOrderHeader == null){
+            return new Result(false,StatusCode.ERROR,"该销售订单不存在，请刷新！");
+        }
         //判断销售订单是否是已审批状态
         //判断销售订单是否是已审批状态
-        if (!"approval".equals(status)) {
+        if (!"approval".equals(status) || !"approval".equals(salOrderHeader.getHeaderStatus())) {
             throw ErrorEnum.NotAllowStatusERROR.createException(wshShipmentHeaderPage.getSourceHeaderNumber());//返回状态不对
             throw ErrorEnum.NotAllowStatusERROR.createException(wshShipmentHeaderPage.getSourceHeaderNumber());//返回状态不对
         }
         }
         //检查accesstoken的有效性
         //检查accesstoken的有效性
@@ -120,8 +124,12 @@ public class WshShipmentController {
     public Result createReceive(@RequestBody RcvReceiptHeaderPage rcvReceiptHeaderPage,
     public Result createReceive(@RequestBody RcvReceiptHeaderPage rcvReceiptHeaderPage,
                                 @RequestParam(value = "status",required = true)String status,
                                 @RequestParam(value = "status",required = true)String status,
                                 @RequestParam(value = "token",required = true)String token){
                                 @RequestParam(value = "token",required = true)String token){
-        //判断销售订单是否是已审批状态
-        if (!"approval".equals(status)) {
+        SalOrderHeader salOrderHeader = salOrderHeaderService.findSalOrderById(rcvReceiptHeaderPage.getSourceHeaderId());
+        if(salOrderHeader == null){
+            return new Result(false,StatusCode.ERROR,"该销售订单不存在，请刷新！");
+        }
+        //判断销售订单是否是已完成状态
+        if (!"completed".equals(status) || !"completed".equals(salOrderHeader.getHeaderStatus())) {
             throw ErrorEnum.NotAllowStatusERROR.createException(rcvReceiptHeaderPage.getSourceHeaderNumber());//返回状态不对
             throw ErrorEnum.NotAllowStatusERROR.createException(rcvReceiptHeaderPage.getSourceHeaderNumber());//返回状态不对
         }
         }
         //检查accesstoken的有效性
         //检查accesstoken的有效性
@@ -155,9 +163,9 @@ public class WshShipmentController {
         BeanUtils.copyProperties(rcvReceiptHeaderPage,rcvReceiptHeader);
         BeanUtils.copyProperties(rcvReceiptHeaderPage,rcvReceiptHeader);
         //增加
         //增加
         rcvReceiptHeaderService.saveMain(rcvReceiptHeader,rcvReceiptHeaderPage.getRcvReceiptLineList());
         rcvReceiptHeaderService.saveMain(rcvReceiptHeader,rcvReceiptHeaderPage.getRcvReceiptLineList());
-        //修改销售订单的状态为已完成completed
-        salOrderLineService.updateSalOrderLineStatus(updateBy,updateTime,"completed",rcvReceiptHeader.getSourceHeaderId());
-        boolean headerTrue = salOrderHeaderService.updateOrderHeaderStatus(updateBy,updateTime,"completed",rcvReceiptHeader.getSourceHeaderId());
+        //修改销售订单的状态为已退货退款
+        salOrderLineService.updateSalOrderLineStatus(updateBy,updateTime,"refund",rcvReceiptHeader.getSourceHeaderId());
+        boolean headerTrue = salOrderHeaderService.updateOrderHeaderStatus(updateBy,updateTime,"refund",rcvReceiptHeader.getSourceHeaderId());
         if(!headerTrue){
         if(!headerTrue){
             throw ErrorEnum.Error.createException("销售订单的状态修改失败");
             throw ErrorEnum.Error.createException("销售订单的状态修改失败");
         }
         }