|
|
@@ -15,12 +15,21 @@ import common.utils.http.MyRet;
|
|
|
import modules.user.UserController;
|
|
|
import modules.user.UserService;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.HashMap;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+
|
|
|
public class OrderController extends MyController {
|
|
|
@Inject
|
|
|
private OrderService service;
|
|
|
@Inject
|
|
|
private UserService userService;
|
|
|
|
|
|
+ public void hello() {
|
|
|
+ renderJson(MyRet.ok(service.hello()));
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 创建订单调用的接口,会检查库存什么的
|
|
|
*/
|
|
|
@@ -226,9 +235,28 @@ public class OrderController extends MyController {
|
|
|
* 管理员更新状态,先不做
|
|
|
*/
|
|
|
@Before(LoginInterceptor.class)
|
|
|
+ @RequiredRoleInterface({UserController.ROLE_CHECK_ADMIN, UserController.ROLE_SUPER_ADMIN})
|
|
|
public void updateByAdmin() {
|
|
|
renderJson(MyRet.fail("后端还没做"));
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取订单的状态码以及对应的状态描述
|
|
|
+ */
|
|
|
+ @Before(LoginInterceptor.class)
|
|
|
+ @RequiredRoleInterface({UserController.ROLE_CHECK_ADMIN, UserController.ROLE_SUPER_ADMIN})
|
|
|
+ public void orderStatus() {
|
|
|
+ List<Map<String, Object>> statusList = new ArrayList<>();
|
|
|
+
|
|
|
+ for (OrderStatus status : OrderStatus.values()) {
|
|
|
+ Map<String, Object> statusMap = new HashMap<>();
|
|
|
+ statusMap.put("code", status.code);
|
|
|
+ statusMap.put("desc", status.desc);
|
|
|
+ statusList.add(statusMap);
|
|
|
+ }
|
|
|
+
|
|
|
+ renderJson(MyRet.ok("查询成功").setData(statusList));
|
|
|
+ }
|
|
|
|
|
|
// 订单状态枚举 (建议定义在单独的类或枚举中)
|
|
|
public enum OrderStatus {
|