Jelajahi Sumber

解决分销设置时的bug

lipf 4 bulan lalu
induk
melakukan
0c612df5d0

+ 7 - 1
commons/src/main/java/com/jzg/commons/entity/po/SysDistributionSetting.java

@@ -9,6 +9,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
 
@@ -21,7 +23,11 @@ import java.util.List;
 @TableName("sys_distribution_setting")
 @NoArgsConstructor
 @AllArgsConstructor
-public class SysDistributionSetting {
+public class SysDistributionSetting implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 5283654276005417794L;
+
     @TableId(type = IdType.ASSIGN_ID)
     private Long id;
 

+ 8 - 1
tenant/organization/src/main/java/com/jzg/organization/controller/SysDistributionSettingController.java

@@ -2,6 +2,7 @@ package com.jzg.organization.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.po.SysDistributionSetting;
 import com.jzg.commons.entity.vo.*;
 import com.jzg.organization.service.SysDistributionSettingService;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -20,8 +21,14 @@ public class SysDistributionSettingController {
     @Resource
     private SysDistributionSettingService sysDistributionSettingService;
 
+    /**
+     * 查询租户的分销设置
+     *
+     * @author lipf
+     * @date 2026/4/23 17:38
+     */
     @GetMapping("/getSettingBySystemCode")
-    public HttpResult getSettingBySystemCode(){
+    public HttpResult<SysDistributionSetting> getSettingBySystemCode(){
         return sysDistributionSettingService.getSettingBySystemCode();
     }
 

+ 7 - 1
tenant/organization/src/main/java/com/jzg/organization/service/SysDistributionSettingService.java

@@ -10,7 +10,13 @@ import java.util.List;
 
 public interface SysDistributionSettingService extends IService<SysDistributionSetting> {
 
-    HttpResult getSettingBySystemCode();
+    /**
+     * 查询租户的分销设置
+     *
+     * @author lipf
+     * @date 2026/4/23 17:38
+     */
+    HttpResult<SysDistributionSetting> getSettingBySystemCode();
 
     HttpResult saveSetting(SysDistributionSettingVo sysDistributionSettingVo);
 

+ 1 - 1
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDistributionSettingServiceImpl.java

@@ -66,7 +66,7 @@ public class SysDistributionSettingServiceImpl extends ServiceImpl<SysDistributi
     @Resource
     private QuoteClient quoteClient;
 
-    public HttpResult getSettingBySystemCode() {
+    public HttpResult<SysDistributionSetting> getSettingBySystemCode() {
         SysDistributionSetting sysDistributionSetting = sysDistributionSettingMapper
                 .selectOne(new LambdaQueryWrapper<SysDistributionSetting>().eq(SysDistributionSetting::getSystemCode, baseController.getUserSystemCode()));
         if (sysDistributionSetting == null) {