资金相关

performance-web/src/main/java/com/clx/performance/service/OrderGoodsService.java

@@ -34,5 +34,5 @@ public interface OrderGoodsService {
 
     List<OrderGoods> getOrderGoodsList(String orderNo, LocalDateTime lastArriveSendTime);
 
-    void orderCancel();
+    String orderCancel();
 }

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

@@ -154,7 +154,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     }
 
     @Override
-    public void orderCancel() {
+    public String orderCancel() {
         String orderNo = "";
         FeignOrderVO orderInfoFeign = orderFeign.getOrderInfoFeign(orderNo);
         Integer orderStatus = orderInfoFeign.getOrderStatus();
@@ -162,12 +162,15 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         switch (orderStatus) {
             case 0:
                 //不算违约 弹窗1
-
+                return "writeRemark";
             case 1:
                 //不算违约 弹窗1
+                return "writeRemark";
 
             case 2:
+
                 //算违约，但是不会有吨数，弹窗2
+                return "reamrkHasAmount";
             case 3:
                 //算违约，但是不会有吨数，弹窗2
             case 4: