Merge branch 'bugfix-0517'

1e7acafc · 徐高华 · 33c49e0a · 7347578f · 1e7acafc
Commit 1e7acafc authored May 22, 2023 by 徐高华
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

GicOrderController.java ...aoban/manage/web/controller/order/GicOrderController.java +2 -2

No files found.
--- a/haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java
+++ b/haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderController.java
@@ -491,10 +491,10 @@ public class GicOrderController {
                response.setErrorCode(checkVO.getCode());
                response.setResult(checkVO.getId());
                response.setDetailError("");
-                return RestResponse.successResult(checkVO);
+                return RestResponse.failure("9999", checkVO.getMessage());
            }
+            return RestResponse.successResult(checkVO) ;
        }
-        return null;
    }

    // 核销数量