联合丽格V1.0.2

src/main/java/com/caimei/modules/order/service/CmReturnedPurchaseService.java

@@ -1163,30 +1163,32 @@ public class CmReturnedPurchaseService extends CrudService<CmReturnedPurchaseDao
                 newOrder.setRefundType("1");
                 String status = newShopOrder.getStatus().toString();
                 if (StringUtils.equals("5", status)) {//如果之前为交易全退，撤销后则变为
-                    if (StringUtils.equals("1", newShopOrder.getReceiptStatus())) {//（收款买家）收款状态：1待收款、2部分收款、3已收款
-                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.DAISHOU_BUFA.getCode()));//待收部发
-                    }
-                    if (StringUtils.equals("2", newShopOrder.getReceiptStatus())) {
-                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.BUSHOU_BUFA.getCode()));//部收部发
-                    }
-                    if (StringUtils.equals("3", newShopOrder.getReceiptStatus())) {
-                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.YISHOU_BUFA.getCode()));//已收部发
-                    }
+                    newShopOrder.setStatus(1);//已确认
+//                    if (StringUtils.equals("1", newShopOrder.getReceiptStatus())) {//（收款买家）收款状态：1待收款、2部分收款、3已收款
+//                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.DAISHOU_BUFA.getCode()));//待收部发
+//                    }
+//                    if (StringUtils.equals("2", newShopOrder.getReceiptStatus())) {
+//                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.BUSHOU_BUFA.getCode()));//部收部发
+//                    }
+//                    if (StringUtils.equals("3", newShopOrder.getReceiptStatus())) {
+//                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.YISHOU_BUFA.getCode()));//已收部发
+//                    }
                 }
             } else {
                 //不存在退款记录则本次退款为未退款
                 String status = newShopOrder.getStatus().toString();
                 newOrder.setRefundType("");
                 if (StringUtils.equals("5", status)) {//如果之前为交易全退，撤销后则变为
-                    if (StringUtils.equals("1", newShopOrder.getReceiptStatus())) {//（收款买家）收款状态：1待收款、2部分收款、3已收款
-                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.DAISHOU_DAIFA.getCode()));//待收待发
-                    }
-                    if (StringUtils.equals("2", newShopOrder.getReceiptStatus())) {
-                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.BUSHOU_DAIFA.getCode()));//部收待发
-                    }
-                    if (StringUtils.equals("3", newShopOrder.getReceiptStatus())) {
-                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.YISHOU_DAIFA.getCode()));//已收待发
-                    }
+                    newShopOrder.setStatus(1);//已确认
+//                    if (StringUtils.equals("1", newShopOrder.getReceiptStatus())) {//（收款买家）收款状态：1待收款、2部分收款、3已收款
+//                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.DAISHOU_DAIFA.getCode()));//待收待发
+//                    }
+//                    if (StringUtils.equals("2", newShopOrder.getReceiptStatus())) {
+//                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.BUSHOU_DAIFA.getCode()));//部收待发
+//                    }
+//                    if (StringUtils.equals("3", newShopOrder.getReceiptStatus())) {
+//                        newShopOrder.setStatus(Integer.valueOf(NewOrderStatus.YISHOU_DAIFA.getCode()));//已收待发
+//                    }
                 }
             }
             newShopOrder.setRefundStatus(1);//无退款

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1583,7 +1583,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         List<NewShopOrder> newShopOrders = order.getNewShopOrders().stream().filter(newShopOrder -> newShopOrder.getShopOrderID().equals(shopOrderID)).collect(Collectors.toList());
         order.setNewShopOrders(newShopOrders);
 
-        order.getNewShopOrders().get(0).setStatus(11);//订单状态变成 ==> 待收款待付款 11
+        order.getNewShopOrders().get(0).setStatus(1);//已确认
 
 
         //修改订单状态（余额抵扣）

src/main/java/com/caimei/modules/order/web/NewOrderController.java

@@ -611,10 +611,10 @@ public class NewOrderController extends BaseController {
 //            addMessage(redirectAttributes, "订单状态异常，请刷新后重试！");
 //            return "redirect:" + Global.getAdminPath() + "/order/detail/?id=" + orderID;
 //        }
-//        if (newShopOrders.get(0).getStatus()!=null && newShopOrders.get(0).getStatus() > 0) {
-//            addMessage(redirectAttributes, "订单状态异常，请刷新后重试！");
-//            return "redirect:" + Global.getAdminPath() + "/order/detail/?id=" + orderID;
-//        }
+        if (newShopOrders.get(0).getStatus()!=null && newShopOrders.get(0).getStatus() > 0) {
+            addMessage(redirectAttributes, "订单状态异常，请刷新后重试！");
+            return "redirect:" + Global.getAdminPath() + "/order/detail/?id=" + orderID;
+        }
         //优惠券确认消耗
         CmCouponOrderRecord orderRecord = order.getCouponOrderRecord();
         if (order.getCouponAmount() > 0 && orderRecord != null) {