Merge remote-tracking branch 'origin/v5.7_break_contract_reverse_20231020' into…

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -166,13 +166,12 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             case 1:
                 //不算违约 弹窗1
                 return "writeRemark";
-
             case 2:
-
                 //算违约，但是不会有吨数，弹窗2
-                return "reamrkHasAmount";
+                return "remarkHasAmount";
             case 3:
                 //算违约，但是不会有吨数，弹窗2
+                return "remarkHasAmount";
             case 4:
                 //已取消状态，不会涉及弹窗
             case 5:
@@ -182,16 +181,22 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             case 7:
                 //挂单中 ，算违约，需要判断弹窗2还是3
                 //约可取消吨数
-                String residueWeight = orderInfoFeign.getResidueWeight();
+                return "selectType";
             case 8: //运输中 ，算违约， 弹窗3
+                return "selectType";
             case 9:  //已完成，不能取消
             case 10: //已失效,不会出现在订单列表
             case 11: //已挂单  算违约  弹窗 2
+                return "remarkHasAmount";
             case 12: //已完结
             default:
                 throw new RuntimeException();
         }
     }
 
+    public String getOrderRe(String orderNo) {
+        return "";
+    }
+
 
 }