更改接口返回方法

yami-shop-common/src/main/java/com/yami/shop/common/enums/ResponseEnum.java

@@ -0,0 +1,51 @@
+package com.yami.shop.common.enums;
+
+import com.yami.shop.common.util.IBasicInfo;
+
+/**
+ * <p>TODO</p>
+ *
+ * @author mr wang
+ * @version 1.0.0
+ * @since 2025-08-26
+ */
+
+public enum ResponseEnum implements IBasicInfo {
+
+    SUCCESS(200, "操作成功"),
+
+    /* 参数错误：10001-19999 */
+    PARAM_IS_INVALID(10001, "参数无效"),
+    PARAM_IS_BLANK(10002, "参数为空"),
+    PARAM_TYPE_BIND_ERROR(10003, "参数格式错误"),
+    PARAM_NOT_COMPLETE(10004, "参数缺失"),
+
+    /* 用户错误：20001-29999*/
+    USER_NOT_LOGGED_IN(20001, "用户未登录，请先登录"),
+    USER_LOGIN_ERROR(20002, "账号不存在或密码错误"),
+    USER_ACCOUNT_FORBIDDEN(20003, "账号已被禁用"),
+    USER_NOT_EXIST(20004, "用户不存在"),
+    USER_HAS_EXISTED(20005, "用户已存在"),
+
+    ERROR(500, "网络繁忙");
+
+
+    private final int code;
+
+    private final String value;
+
+    ResponseEnum(int code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    @Override
+    public int getCode() {
+        return code;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+}

yami-shop-common/src/main/java/com/yami/shop/common/util/IBasicInfo.java

@@ -0,0 +1,16 @@
+package com.yami.shop.common.util;
+
+/**
+ * <p>TODO</p>
+ *
+ * @author mr wang
+ * @version 1.0.0
+ * @since 2025-08-26
+ */
+public interface IBasicInfo {
+
+    int getCode();
+
+    String getValue();
+
+}

yami-shop-common/src/main/java/com/yami/shop/common/util/R.java

@@ -0,0 +1,108 @@
+package com.yami.shop.common.util;
+
+/**
+ * <p>TODO</p>
+ *
+ * @author mr wang
+ * @version 1.0.0
+ * @since 2025-08-26
+ */
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.yami.shop.common.enums.ResponseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>统一响应结果</p>
+ *
+ * @param <T> 任意泛型
+ * @author 王坚
+ * @time 2018-11-8
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class R<T> {
+
+    int code;
+
+    T data;
+
+    String msg;
+
+    boolean success;
+
+
+    public static <T> R<T> SUCCESS() {
+        return new R<>(ResponseEnum.SUCCESS.getCode(), null, ResponseEnum.SUCCESS.getValue(), Boolean.TRUE);
+    }
+
+    public static <T> R<T> SUCCESS(T param) {
+        int code = ResponseEnum.SUCCESS.getCode();
+        String value = ResponseEnum.SUCCESS.getValue();
+        try {
+            if (param.getClass().isEnum()) {
+                IBasicInfo basicInfo = (IBasicInfo) param;
+                code = basicInfo.getCode();
+                value = basicInfo.getValue();
+                return new R<>(code, null, value, Boolean.TRUE);
+            }
+        } catch (NullPointerException e) {
+            return new R<>(code, null, value, Boolean.TRUE);
+        }
+        return new R<>(code, param, value, Boolean.TRUE);
+    }
+
+    public static <T> R<T> SUCCESS(T param, String msg) {
+        return new R<>(ResponseEnum.SUCCESS.getCode(), param, msg, Boolean.TRUE);
+    }
+
+    public static <T> R<T> SUCCESS(Integer code, T param, String msg) {
+        return new R<>(code, param, msg, Boolean.TRUE);
+    }
+
+    public static <T> R<T> FAIL() {
+        return new R<>(ResponseEnum.ERROR.getCode(), null, ResponseEnum.ERROR.getValue(), Boolean.FALSE);
+    }
+
+    public static <T> R<T> FAIL(T param) {
+        int code = ResponseEnum.ERROR.getCode();
+        String value = ResponseEnum.ERROR.getValue();
+        try {
+            if (param.getClass().isEnum()) {
+                IBasicInfo basicInfo = (IBasicInfo) param;
+                code = basicInfo.getCode();
+                value = basicInfo.getValue();
+                return new R<>(code, null, value, Boolean.FALSE);
+            }
+        } catch (NullPointerException e) {
+            return new R<>(code, null, value, Boolean.FALSE);
+        }
+        return new R<>(code, param, value, Boolean.FALSE);
+    }
+
+    public static <T> R<T> FAIL(String msg) {
+        return new R<>(ResponseEnum.ERROR.getCode(), null, msg, Boolean.FALSE);
+    }
+
+    public static <T> R<T> FAIL(int code) {
+        return new R<>(code, null, ResponseEnum.ERROR.getValue(), Boolean.FALSE);
+    }
+
+    public static <T> R<T> FAIL(T param, String msg) {
+        return new R<>(ResponseEnum.ERROR.getCode(), param, msg, Boolean.FALSE);
+    }
+
+
+    public static <T> R<T> FAIL(int code, String msg) {
+        return new R<>(code, null, msg, Boolean.FALSE);
+    }
+
+    public static <T> R<T> FAIL(int code, T param, String msg) {
+        return new R<>(code, param, msg, Boolean.FALSE);
+    }
+
+}

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/UserAddrController.java

@@ -37,6 +37,7 @@ import java.util.*;
 
 
 /**
+ * 用户地址管理
  * @author lgh on 2018/10/16.
  */
 @RestController

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/UserController.java

@@ -10,15 +10,12 @@
 
 package com.yami.shop.platform.controller;
 
-import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.bean.model.User;
 import com.yami.shop.common.util.PageParam;
 import com.yami.shop.common.util.RedisUtil;
 import com.yami.shop.security.comment.constants.SecurityConstants;
 import com.yami.shop.security.comment.enums.App;
-import com.yami.shop.security.comment.model.AppConnect;
 import com.yami.shop.security.comment.service.AppConnectService;
 import com.yami.shop.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +33,7 @@ import java.util.*;
 
 
 /**
+ * 用户信息
  * @author lgh on 2018/10/16.
  */
 @RestController

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/hb/OrderController.java → yami-shop-platform/src/main/java/com/yami/shop/platform/controller/hb/HBOrderController.java

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
 @AllArgsConstructor
 @CrossOrigin
 @Api(tags = "订单管理", description = "订单管理相关接口")
-public class OrderController {
+public class HBOrderController {
 
 
     /**

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/hb/StoreManagementController.java

@@ -53,64 +53,4 @@ public class StoreManagementController {
 
 
 
-    /**
-     * 查询所有门店
-     *
-     * @return 门店列表
-     */
-    @GetMapping("/all")
-    public List<StoreManagement> getAllStores() {
-        log.info("查询所有门店");
-        return storeManagementService.findAllStores();
-    }
-
-    /**
-     * 更新门店信息
-     *
-     * @param store 门店信息
-     * @return 更新后的门店信息
-     */
-    @PutMapping("/updateStore")
-    public StoreManagement updateStore(@RequestBody StoreManagement store) {
-        log.info("更新门店信息，门店ID：{}", store.getId());
-        return storeManagementService.updateStore(store);
-    }
-
-    /**
-     * 删除门店
-     *
-     * @param storeId 门店ID
-     * @return 删除结果
-     */
-    @DeleteMapping("/{storeId}")
-    public boolean deleteStore(@PathVariable Long storeId) {
-        log.info("删除门店，门店ID：{}", storeId);
-        return storeManagementService.deleteStore(storeId);
-    }
-
-    /**
-     * 启用门店
-     *
-     * @param storeId 门店ID
-     * @return 启用结果
-     */
-    @PutMapping("/{storeId}/enable")
-    public boolean enableStore(@PathVariable Long storeId) {
-        log.info("启用门店，门店ID：{}", storeId);
-        return storeManagementService.enableStore(storeId);
-    }
-
-    /**
-     * 禁用门店
-     *
-     * @param storeId 门店ID
-     * @return 禁用结果
-     */
-    @PutMapping("/{storeId}/disable")
-    public boolean disableStore(@PathVariable Long storeId) {
-        log.info("禁用门店，门店ID：{}", storeId);
-        return storeManagementService.disableStore(storeId);
-    }
-
-
 }

yami-shop-service/src/main/java/com/yami/shop/service/hb/IStoreManagementService.java

@@ -42,5 +42,12 @@ public interface IStoreManagementService {
     HBR updateRegisterStore(JSONObject registerRequest);
 
 
+    /**
+     * 门店配送费模板变更通知
+     *
+     * @param registerRequest 门店配送费模板变更通知内容
+     * @return 模板变更通知响应
+     */
+    StoreRegister updateStoreDeliveryFeeTemplate(JSONObject registerRequest);
 
 }

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/StoreManagementService.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yami.shop.bean.dto.hb.HBBaseReq;
 import com.yami.shop.bean.dto.hb.HBStoreBaseInfoReq;
+import com.yami.shop.bean.dto.hb.StoreRegister;
 import com.yami.shop.bean.model.ShopDetail;
 import com.yami.shop.common.util.hb.HBR;
 import com.yami.shop.dao.ShopDetailMapper;
@@ -112,5 +113,9 @@ public class StoreManagementService implements IStoreManagementService {
         }
     }
 
+    @Override
+    public StoreRegister updateStoreDeliveryFeeTemplate(JSONObject registerRequest) {
+        return null;
+    }
 
 }

yami-shop-sys/src/main/java/com/yami/shop/sys/controller/SysUserController.java

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yami.shop.common.annotation.SysLog;
 import com.yami.shop.common.util.PageParam;
+import com.yami.shop.common.util.R;
 import com.yami.shop.security.comment.model.UpdatePasswordDto;
 import com.yami.shop.security.platform.util.SecurityUtils;
 import com.yami.shop.common.config.Constant;
@@ -69,8 +70,8 @@ public class SysUserController {
 	 * 获取登录的用户信息
 	 */
 	@GetMapping("/info")
-	public ResponseEntity<SysUser> info(){
-		return ResponseEntity.ok(sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId()));
+	public R<SysUser> info(){
+		return R.SUCCESS(sysUserService.getSysUserById(SecurityUtils.getSysUser().getUserId()));
 	}
 
 	/**