Merge remote-tracking branch 'origin/master'

java/storlead-api/src/main/java/com/storlead/login/AuthCaptchaApiController.java

@@ -19,7 +19,7 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("/sys/auth/captcha")
-@Api(tags = "系统模块 -> 验证码（解耦）")
+@Api(tags = "系统: 验证码")
 public class AuthCaptchaApiController {
 
     @Resource

java/storlead-api/src/main/java/com/storlead/login/TenantLoginApiController.java

@@ -51,7 +51,7 @@ import java.util.concurrent.TimeUnit;
  */
 @RestController
 @RequestMapping("/sys/auth")
-@Api(tags = "系统模块 -> 租户登录")
+@Api(tags = "租户: 租户登录")
 @Slf4j
 public class TenantLoginApiController {
 

java/storlead-api/src/main/java/com/storlead/system/controller/FileResourceController.java

@@ -40,7 +40,7 @@ import java.util.Objects;
 @Log4j2
 @RestController
 @RequestMapping("/oss/file")
-@Api(tags="051.公共接口")
+@Api(tags="系统: 公共接口")
 public class FileResourceController {
 
     @Resource

java/storlead-api/src/main/java/com/storlead/system/controller/LoginApiController.java

@@ -57,7 +57,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/sys/auth")
-@Api(tags="5.认证接口")
+@Api(tags="系统: 认证接口")
 @Slf4j
 public class LoginApiController {
 

java/storlead-api/src/main/java/com/storlead/system/controller/LoginController.java

@@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit;
  */
 @RestController
 @RequestMapping("/lingcun")
-@Api(tags="5.公共接口")
+@Api(tags="系统: 公共接口")
 @Slf4j
 public class LoginController {
 	@Resource

java/storlead-api/src/main/java/com/storlead/system/controller/UserController.java

@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @RestController
 @RequestMapping("/lingcun/user")
-@Api(tags="5.公共接口")
+@Api(tags="系统: 公共接口")
 public class UserController {
 
 	@Resource

java/storlead-api/src/main/java/com/springfox/documentation/schema/Example.java → java/storlead-api/src/main/java/springfox/documentation/schema/Example.java

@@ -1,23 +1,28 @@
-package com.springfox.documentation.schema;
+package springfox.documentation.schema;
+
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import springfox.documentation.service.VendorExtension;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import springfox.documentation.service.VendorExtension;
 
+/**
+ * 覆盖 springfox-core 3.0.0 同名类，修复 id 为 null 时 {@link #equals(Object)} NPE（Issue #3989/#4003）。
+ */
 @JsonInclude(Include.NON_EMPTY)
 public class Example {
+
     private final String id;
     private final String summary;
     private final String description;
     private final Object value;
     private final String externalValue;
     private final String mediaType;
-    private final List<VendorExtension> extensions = new ArrayList();
+    private final List<VendorExtension> extensions = new ArrayList<>();
 
-    /** @deprecated */
     @Deprecated
     public Example(Object value) {
         this.value = value;
@@ -28,7 +33,6 @@ public class Example {
         this.description = null;
     }
 
-    /** @deprecated */
     @Deprecated
     public Example(String mediaType, Object value) {
         this.mediaType = mediaType;
@@ -39,7 +43,8 @@ public class Example {
         this.description = null;
     }
 
-    public Example(String id, String summary, String description, Object value, String externalValue, String mediaType) {
+    public Example(String id, String summary, String description, Object value, String externalValue,
+            String mediaType) {
         this.id = id;
         this.summary = summary;
         this.description = description;
@@ -49,49 +54,58 @@ public class Example {
     }
 
     public String getId() {
-        return this.id;
+        return id;
     }
 
     public String getSummary() {
-        return this.summary;
+        return summary;
     }
 
     public String getDescription() {
-        return this.description;
+        return description;
     }
 
     public String getExternalValue() {
-        return this.externalValue;
+        return externalValue;
     }
 
     public List<VendorExtension> getExtensions() {
-        return this.extensions;
+        return extensions;
     }
 
     public Object getValue() {
-        return this.value;
+        return value;
     }
 
     public Optional<String> getMediaType() {
-        return Optional.ofNullable(this.mediaType);
+        return Optional.ofNullable(mediaType);
     }
 
+    @Override
     public String toString() {
-        return String.valueOf(this.value);
+        return String.valueOf(value);
     }
 
+    @Override
     public boolean equals(Object o) {
         if (this == o) {
             return true;
-        } else if (o != null && !o.toString().equals("")) {
-            Example example = (Example)o;
-            return this.id.equals(example.id) && Objects.equals(this.summary, example.summary) && Objects.equals(this.description, example.description) && this.value.equals(example.value) && this.externalValue.equals(example.externalValue) && this.mediaType.equals(example.mediaType) && this.extensions.equals(example.extensions);
-        } else {
+        }
+        if (o == null || getClass() != o.getClass()) {
             return false;
         }
+        Example example = (Example) o;
+        return Objects.equals(id, example.id)
+                && Objects.equals(summary, example.summary)
+                && Objects.equals(description, example.description)
+                && Objects.equals(value, example.value)
+                && Objects.equals(externalValue, example.externalValue)
+                && Objects.equals(mediaType, example.mediaType)
+                && Objects.equals(extensions, example.extensions);
     }
 
+    @Override
     public int hashCode() {
-        return Objects.hash(new Object[]{this.id, this.summary, this.description, this.value, this.externalValue, this.mediaType, this.extensions});
+        return Objects.hash(id, summary, description, value, externalValue, mediaType, extensions);
     }
 }

java/storlead-knowledge/storlead-knowledge-api/src/main/java/com/storlead/knowledge/api/ChatController.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 
 @RestController
 @RequestMapping("/chat/")
-@Api(tags = "对话及流程")
+@Api(tags = "知识库: 对话及流程")
 public class ChatController {
     @Resource
     private HttpService httpService;

java/storlead-knowledge/storlead-knowledge-api/src/main/java/com/storlead/knowledge/api/ChunkController.java

@@ -18,7 +18,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/knowledge/chunk/")
-@Api(tags = "知识库--文档--文本块")
+@Api(tags = "知识库: 文档文本块")
 public class ChunkController {
     @Resource
     private HttpService httpService;

java/storlead-knowledge/storlead-knowledge-api/src/main/java/com/storlead/knowledge/api/DocumentController.java

@@ -20,7 +20,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/knowledge/document/")
-@Api(tags = "知识库")
+@Api(tags = "知识库: 知识库管理")
 public class DocumentController {
     @Resource
     private HttpService httpService;

java/storlead-knowledge/storlead-knowledge-api/src/main/java/com/storlead/knowledge/api/KnowledgeController.java

@@ -19,7 +19,7 @@ import java.util.Map;
 
 @RestController
 @RequestMapping("/knowledge/base/")
-@Api(tags = "知识库")
+@Api(tags = "知识库: 知识库管理")
 public class KnowledgeController {
     @Resource
     private HttpService httpService;

java/storlead-knowledge/storlead-knowledge-api/src/main/java/com/storlead/knowledge/api/TagController.java

@@ -16,7 +16,7 @@ import javax.annotation.Resource;
 
 @RestController
 @RequestMapping("/knowledge/tag/")
-@Api(tags = "知识库")
+@Api(tags = "知识库: 知识库管理")
 public class TagController {
     @Resource
     private HttpService httpService;

java/storlead-mail/storlead-mail-api/src/main/java/com/storlead/mail/controller/EmailFolderRuleApiController.java

@@ -41,7 +41,7 @@ import java.util.*;
 @RestController
 @Log4j2
 @RequestMapping("/email/folder/rule")
-@Api(tags = "邮件:邮件自定义入站规则")
+@Api(tags = "邮件: 邮件自定义入站规则")
 public class EmailFolderRuleApiController {
 
     @Resource

java/storlead-mail/storlead-mail-api/src/main/java/com/storlead/mail/controller/MaiAttachmentApiController.java

@@ -38,7 +38,7 @@ import java.util.*;
  */
 @RestController
 @RequestMapping("/mail/file")
-@Api(tags = "020.邮件管理相关接口")
+@Api(tags = "邮件: 邮件管理")
 @Log4j2
 public class MaiAttachmentApiController {
 

java/storlead-mail/storlead-mail-api/src/main/java/com/storlead/mail/controller/MailBlacklistRecordApiController.java

@@ -36,7 +36,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/email/blacklist")
-@Api(tags = "邮件系统：黑名单")
+@Api(tags = "邮件: 黑名单")
 @Log4j2
 public class MailBlacklistRecordApiController {
 

java/storlead-mail/storlead-mail-api/src/main/java/com/storlead/mail/controller/MailTemplatesApiController.java

@@ -31,7 +31,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/email/templates")
-@Api(tags = "邮件系统：邮件模板")
+@Api(tags = "邮件: 邮件模板")
 @Log4j2
 public class MailTemplatesApiController {
 

java/storlead-mail/storlead-mail-api/src/main/java/com/storlead/mail/controller/MailboxAutoReplySetController.java

@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/mail/mailbox/reply")
-@Api(tags = "020.邮件管理相关接口")
+@Api(tags = "邮件: 邮件管理")
 @Log4j2
 public class MailboxAutoReplySetController {
 

java/storlead-mail/storlead-mail-api/src/main/java/com/storlead/mail/controller/SmtpPopMailApiController.java

@@ -55,7 +55,7 @@ package com.storlead.mail.controller;//package com.storlead.sales.mail;
 // */
 //@RestController
 //@RequestMapping("/mail")
-//@Api(tags = "020.邮件管理相关接口")
+//@Api(tags = "邮件: 邮件管理")
 //public class SmtpPopMailApiController {
 //
 ////    @Resource

java/storlead-mail/storlead-mail-api/src/main/java/com/storlead/mail/controller/SmtpPopSettingsApiController.java

@@ -47,7 +47,7 @@ import java.util.*;
 @Log4j2
 @RestController
 @RequestMapping("/smtp/pop/setting")
-@Api(tags = "020.邮件管理相关接口")
+@Api(tags = "邮件: 邮件管理")
 public class SmtpPopSettingsApiController {
 
     @Resource

java/storlead-mail/storlead-mail-api/src/main/java/com/storlead/mail/controller/UserEmailFolderApiController.java

@@ -36,7 +36,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/user/email/folder")
-@Api(tags = "邮件:邮件自定义文件夹")
+@Api(tags = "邮件: 邮件自定义文件夹")
 public class UserEmailFolderApiController {
     @Resource
     private UserEmailFolderService emailFolderService;

java/storlead-message/storlead-message-api/src/main/java/com/storlead/message/controller/MessageApiController.java

@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/sys/inside/message")
-@Api(tags = "消息系统： 站内消息相关接口")
+@Api(tags = "消息: 站内消息相关接口")
 public class MessageApiController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/ai/AiPromptTemplateController.java

@@ -32,7 +32,7 @@
 // */
 //@RestController
 //@RequestMapping("/ai/prompt")
-//@Api(tags = "AI提示词配置")
+//@Api(tags = "销售: AI提示词配置")
 //public class AiPromptTemplateController {
 //
 //    @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/BulletinController.java

@@ -30,7 +30,7 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("/bulletin")
-@Api(tags = "014.公告相关接口")
+@Api(tags = "销售: 公告相关接口")
 public class BulletinController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/BusinessController.java

@@ -51,7 +51,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/business")
-@Api(tags = "005.商机管理相关接口")
+@Api(tags = "销售: 商机管理相关接口")
 @Log4j2
 public class BusinessController {
 

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/BusinessTransferController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/business")
-@Api(tags = "005.商机管理相关接口")
+@Api(tags = "销售: 商机管理相关接口")
 public class BusinessTransferController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CommonApiController.java

@@ -17,7 +17,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/common")
-@Api(tags = "业务公共API")
+@Api(tags = "销售: 业务公共API")
 public class CommonApiController {
 
     /**

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CustomerCompanyController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/customer-company")
-@Api(tags = "002.客户管理相关接口")
+@Api(tags = "销售: 客户管理相关接口")
 public class CustomerCompanyController {
 
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CustomerComparisonApiController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/customer/comparison")
-@Api(tags = "002.客户管理相关接口")
+@Api(tags = "销售: 客户管理相关接口")
 public class CustomerComparisonApiController {
 
     @PostMapping(value = "/comparison-customer-name")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CustomerController.java

@@ -52,7 +52,7 @@ import java.util.stream.Collectors;
 @RestController
 @Log4j2
 @RequestMapping("/customer")
-@Api(tags = "002.客户管理相关接口")
+@Api(tags = "销售: 客户管理相关接口")
 public class CustomerController {
     @Resource
     private CustomerService customerService;

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CustomerFollowUpController.java

@@ -27,7 +27,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/customer-follow-up")
-@Api(tags = "002.客户管理相关接口")
+@Api(tags = "销售: 客户管理相关接口")
 public class CustomerFollowUpController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CustomerFollowUpEmailsController.java

@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/customer-follow-up-emails")
-@Api(tags = "002.客户管理相关接口")
+@Api(tags = "销售: 客户管理相关接口")
 public class CustomerFollowUpEmailsController {
     @Resource
     private CustomerFollowUpEmailsService customerFollowUpEmailsService;

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CustomerOwnerRecordController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/customer-owner-record")
-@Api(tags = "002.客户管理相关接口")
+@Api(tags = "销售: 客户管理相关接口")
 public class CustomerOwnerRecordController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CustomerSearchController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/customer-search")
-@Api(tags = "019.通用查询相关接口")
+@Api(tags = "销售: 通用查询相关接口")
 public class CustomerSearchController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CustomerTransferController.java

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/customer")
-@Api(tags = "002.客户管理相关接口")
+@Api(tags = "销售: 客户管理相关接口")
 public class CustomerTransferController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/CustomerUserFollowController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/customer")
-@Api(tags = "002.客户管理相关接口")
+@Api(tags = "销售: 客户管理相关接口")
 public class CustomerUserFollowController {
     @Resource
     private CustomerUserFollowService customerUserFollowService;

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/DynamicLogController.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/dynamic-log")
-@Api(tags = "012.通用动态管理相关接口")
+@Api(tags = "销售: 通用动态管理相关接口")
 public class DynamicLogController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/LiaisonController.java

@@ -40,7 +40,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/liaison")
-@Api(tags = "003.客户联系人管理相关接口")
+@Api(tags = "销售: 客户联系人管理相关接口")
 public class LiaisonController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/LiaisonResourceController.java

@@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/liaison-resource")
-@Api(tags = "003.客户联系人管理相关接口")
+@Api(tags = "销售: 客户联系人管理相关接口")
 public class LiaisonResourceController {
     @Resource
     private LiaisonResourceService liaisonResourceService;

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/OrderFormController.java

@@ -50,7 +50,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/order-form")
-@Api(tags = "006.订单管理相关接口")
+@Api(tags = "销售: 订单管理相关接口")
 @Log4j2
 public class OrderFormController {
 

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/OrderFormTransferController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/order-form-transfer")
-@Api(tags = "006.订单管理相关接口")
+@Api(tags = "销售: 订单管理相关接口")
 public class OrderFormTransferController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/RecordCommentController.java

@@ -32,7 +32,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/record-comment")
-@Api(tags = "010.通用评论相关接口")
+@Api(tags = "销售: 通用评论相关接口")
 public class RecordCommentController {
     @Resource
     private RecordCommentService recordCommentService;

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/SendRecordController.java

@@ -34,7 +34,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/send-record")
-@Api(tags = "002.客户管理相关接口")
+@Api(tags = "销售: 客户管理相关接口")
 public class SendRecordController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/SummaryController.java

@@ -33,7 +33,7 @@ import java.util.Set;
  */
 @RestController
 @RequestMapping("/Summary")
-@Api(tags = "018.汇总管理相关接口")
+@Api(tags = "销售: 汇总管理相关接口")
 public class SummaryController {
     @Resource
     private BusinessService businessService;

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/SysResourceController.java

@@ -39,7 +39,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/sys-resource")
-@Api(tags = "011.系统附件管理相关接口")
+@Api(tags = "销售: 系统附件管理相关接口")
 public class SysResourceController {
     @Resource
     private SysResourceService sysResourceService;

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/WorkDynamicsController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/work-dynamics")
-@Api(tags = "017.工作动态相关接口")
+@Api(tags = "销售: 工作动态相关接口")
 public class WorkDynamicsController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/WorkOrderController.java

@@ -29,7 +29,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/work-order")
-@Api(tags = "004.工单管理相关接口")
+@Api(tags = "销售: 工单管理相关接口")
 public class WorkOrderController {
     @Resource
     private WorkOrderService workOrderService;

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customer/WorkOrderViewLogController.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/work-order-view-log")
-@Api(tags = "004.工单管理相关接口")
+@Api(tags = "销售: 工单管理相关接口")
 public class WorkOrderViewLogController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/customized/ListColumnPersonalizeApiController.java

@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/personalize")
-@Api(tags = "个性化设置功能")
+@Api(tags = "销售: 个性化设置")
 public class ListColumnPersonalizeApiController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/es/ElasticSearchApiController.java

@@ -37,7 +37,7 @@
 // */
 //@RestController
 //@RequestMapping("/elastic/search")
-//@Api(tags = "014.公告相关接口")
+//@Api(tags = "销售: 公告相关接口")
 //public class ElasticSearchApiController {
 //
 //    @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/excel/ExcelMangeApiController.java

@@ -82,7 +82,7 @@ import java.util.stream.Collectors;
  * @author: chenkq
  * @create: 2024-04-09 16:47
  */
-@Api(tags = "系统: Excel导入导出操作")
+@Api(tags = "销售: Excel导入导出操作")
 @Log4j2
 @RestController
 @RequestMapping("/excel")

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/finance/OrderCostApiController.java

@@ -1,91 +0,0 @@
-package com.storlead.sales.controller.finance;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.storlead.framework.common.constant.CodeGenerateInterface;
-import com.storlead.framework.common.constant.CommonConstant;
-import com.storlead.framework.common.util.generate.CodeGenerate;
-import com.storlead.framework.common.result.Result;
-import com.storlead.sales.enums.ReimburseStatusEnum;
-import com.storlead.sales.pojo.dto.finance.OrderReceivePlanQueryDTO;
-import com.storlead.sales.pojo.entity.finance.OrderCostRecordEntity;
-import com.storlead.sales.service.finance.OrderCostRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * @program: sp-sales-platform
- * @description: 费用
- * @author: chenkq
- * @create: 2024-07-31 15:18
- */
-@Api(tags = "财务: 费用")
-@RestController
-@RequestMapping("/finance/rost")
-public class OrderCostApiController {
-
-
-    @Resource
-    private OrderCostRecordService costRecordService;
-
-    @ApiOperation(value = "获取费用记录")
-    @PostMapping( "/list_page")
-    public Result<?> list(@RequestBody OrderReceivePlanQueryDTO dto) {
-        IPage<OrderCostRecordEntity> page = new Page<>(dto.getPageIndex(),dto.getPageSize());
-        LambdaQueryWrapper<OrderCostRecordEntity> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(OrderCostRecordEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        IPage<OrderCostRecordEntity> pageList = costRecordService.page(page,queryWrapper);
-        return Result.result(pageList);
-    }
-
-    @ApiOperation(value = "保存费用记录")
-    @PostMapping( "/save")
-    public Result<?> save(@RequestBody OrderCostRecordEntity record) {
-        if (Objects.isNull(record.getId())) {
-            record.setDataCode(CodeGenerate.generate12Code(CodeGenerateInterface.ORDER_COST_CODE));
-        }
-        costRecordService.saveOrUpdate(record);
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "获取详情")
-    @PostMapping( "/get_detial")
-    public Result<?> getDetail(Long id) {
-        OrderCostRecordEntity record = costRecordService.getById(id);
-        if (Objects.isNull(record)) {
-            return Result.error("费用记录不存在");
-        }
-        return Result.ok(record);
-    }
-
-    @ApiOperation(value = "删除费用记录")
-    @PostMapping( "/delete")
-    public Result<?> delete(Long id) {
-        OrderCostRecordEntity record = costRecordService.getById(id);
-        if (Objects.isNull(record)) {
-            return Result.error("费用记录不存在");
-        }
-        if (ReimburseStatusEnum.NOT_REIMBURSEED.getCode().equals(record.getReimburseStatus())) {
-            costRecordService.lgDelete(id);
-        } else {
-            return Result.error("费用记录已报销，不能删除");
-        }
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "批量删除费用记录")
-    @PostMapping( "/deleteIds")
-    public Result<?> deleteIds(Long [] ids) {
-        costRecordService.lgDelete(Arrays.asList(ids));
-        return Result.ok();
-    }
-}

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/finance/OrderInvoiceRecordApiController.java

@@ -1,82 +0,0 @@
-package com.storlead.sales.controller.finance;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.storlead.framework.common.constant.CodeGenerateInterface;
-import com.storlead.framework.common.constant.CommonConstant;
-import com.storlead.framework.common.util.generate.CodeGenerate;
-import com.storlead.framework.common.result.Result;
-import com.storlead.sales.pojo.dto.finance.OrderReceivePlanQueryDTO;
-import com.storlead.sales.pojo.entity.finance.OrderInvoiceRecordEntity;
-import com.storlead.sales.service.finance.OrderInvoiceRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * @program: sp-sales-platform
- * @description:
- * @author: chenkq
- * @create: 2024-07-31 11:08
- */
-@Api(tags = "财务: 发票")
-@RestController
-@RequestMapping("/finance/invoice")
-public class OrderInvoiceRecordApiController {
-
-    @Resource
-    private OrderInvoiceRecordService invoiceRecordService;
-
-    @ApiOperation(value = "获取发票记录")
-    @PostMapping( "/list_page")
-    public Result<?> list(@RequestBody OrderReceivePlanQueryDTO dto) {
-        IPage<OrderInvoiceRecordEntity> page = new Page<>(dto.getPageIndex(),dto.getPageSize());
-        LambdaQueryWrapper<OrderInvoiceRecordEntity> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(OrderInvoiceRecordEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        IPage<OrderInvoiceRecordEntity> pageList = invoiceRecordService.page(page,queryWrapper);
-        return Result.result(pageList);
-    }
-
-    @ApiOperation(value = "保存发票")
-    @PostMapping( "/save")
-    public Result<?> save(@RequestBody OrderInvoiceRecordEntity record) {
-        if (Objects.isNull(record.getId())) {
-            record.setDataCode(CodeGenerate.generate12Code(CodeGenerateInterface.ORDER_RECEIVE_CODE));
-        }
-        invoiceRecordService.saveOrUpdate(record);
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "获取详情")
-    @PostMapping( "/get_detial")
-    public Result<?> getDetail(Long id) {
-        OrderInvoiceRecordEntity record = invoiceRecordService.getById(id);
-        if (Objects.isNull(record)) {
-            return Result.error("发票记录不存在");
-        }
-        return Result.ok(record);
-    }
-
-    @ApiOperation(value = "删除发票")
-    @PostMapping( "/delete")
-    public Result<?> delete(Long id) {
-        invoiceRecordService.lgDelete(id);
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "批量除发票")
-    @PostMapping( "/deleteIds")
-    public Result<?> deleteIds(Long [] ids) {
-        invoiceRecordService.lgDelete(Arrays.asList(ids));
-        return Result.ok();
-    }
-
-}

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/finance/OrderReceivePlanApiController.java

@@ -1,393 +0,0 @@
-package com.storlead.sales.controller.finance;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.storlead.framework.common.constant.CommonConstant;
-import com.storlead.framework.common.result.Result;
-import com.storlead.sales.pojo.entity.customer.CustomerEntity;
-import com.storlead.sales.pojo.entity.customer.OrderFormEntity;
-import com.storlead.sales.enums.ApproveStatusEnum;
-import com.storlead.sales.enums.ReceivePlanStatusEnum;
-import com.storlead.sales.enums.TaskStatusEnum;
-import com.storlead.sales.pojo.dto.finance.OrderReceivePlanDTO;
-import com.storlead.sales.pojo.dto.finance.OrderReceivePlanQueryDTO;
-import com.storlead.sales.pojo.entity.finance.OrderReceivePlanDetailEntity;
-import com.storlead.sales.pojo.entity.finance.OrderReceivePlanRecordEntity;
-import com.storlead.sales.pojo.entity.finance.OrderReceiveRecordEntity;
-import com.storlead.sales.pojo.vo.finance.OrderReceivePlanDetailVO;
-import com.storlead.sales.pojo.vo.finance.OrderReceivePlanVO;
-import com.storlead.sales.pojo.vo.finance.OrderReceiveRecordVO;
-import com.storlead.sales.pojo.vo.finance.ReceivePlanDetailVO;
-import com.storlead.sales.service.customer.CustomerService;
-import com.storlead.sales.service.customer.OrderFormService;
-import com.storlead.sales.service.finance.OrderReceivePlanDetailService;
-import com.storlead.sales.service.finance.OrderReceivePlanRecordService;
-import com.storlead.sales.service.finance.OrderReceiveRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
-
-/**
- * @program: sp-sales-platform
- * @description:
- * @author: chenkq
- * @create: 2024-07-26 14:39
- */
-@Api(tags = "财务: 回款计划")
-@RestController
-@RequestMapping("/finance/receive/plan")
-public class OrderReceivePlanApiController {
-
-    @Resource
-    private OrderReceivePlanRecordService orderReceivePlanService;
-
-    @Resource
-    private OrderReceivePlanDetailService orderReceivePlanDetailService;
-
-    @Resource
-    private OrderReceiveRecordService orderReceiveRecordService;
-
-    @Resource
-    private OrderFormService orderFormService;
-
-    @Resource
-    private CustomerService customerService;
-
-    @ApiOperation(value = "获取回款计划")
-    @PostMapping( "/list_page")
-    public Result<?> list(@RequestBody OrderReceivePlanQueryDTO dto) {
-
-        IPage<OrderReceivePlanDetailEntity> page = new Page<>(dto.getPageIndex(),dto.getPageSize());
-        LambdaQueryWrapper<OrderReceivePlanDetailEntity> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(OrderReceivePlanDetailEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        IPage<OrderReceivePlanDetailEntity> pageList = orderReceivePlanDetailService.page(page,queryWrapper);
-        return Result.result(pageList);
-
-    }
-
-    @ApiOperation(value = "获取回款计划详情")
-    @PostMapping( "/get_plan_detail")
-    public Result<?> getPlanDetail(Long detailId) {
-
-        if (Objects.isNull(detailId)) {
-            return Result.error("参数错误");
-        }
-        OrderReceivePlanDetailEntity receiveDetail = orderReceivePlanDetailService.getById(detailId);
-        if (Objects.isNull(receiveDetail)) {
-            return Result.error("参数错误");
-        }
-        OrderReceivePlanVO planVO = new OrderReceivePlanVO();
-        OrderReceivePlanDetailVO detailVo = new OrderReceivePlanDetailVO();
-        BeanUtils.copyProperties(receiveDetail,detailVo);
-        planVO.setDetail(detailVo);
-
-        Long orderId =  receiveDetail.getOrderId();
-        OrderFormEntity orderForm = orderFormService.getById(receiveDetail.getOrderId());
-        if (Objects.isNull(orderForm)) {
-            return Result.error("参数错误");
-        }
-
-        LambdaQueryWrapper<OrderReceivePlanRecordEntity> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(OrderReceivePlanRecordEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        queryWrapper.eq(OrderReceivePlanRecordEntity::getOrderId,orderId);
-        queryWrapper.last("limit 1");
-        OrderReceivePlanRecordEntity plan = orderReceivePlanService.getOne(queryWrapper);
-        if (Objects.isNull(plan)) {
-            return Result.error("参数错误!");
-        }
-        BeanUtils.copyProperties(plan,planVO);
-        planVO.setOrderName(orderForm.getTitle());
-        CustomerEntity customer = customerService.getById(orderForm.getCustomerId());
-         if (Objects.isNull(customer)) {
-             planVO.setCustomerName("");
-        } else {
-             planVO.setCustomerName(customer.getCustomerName());
-        }
-
-        LambdaQueryWrapper<OrderReceivePlanDetailEntity> detailWrapper = new LambdaQueryWrapper();
-        detailWrapper.eq(OrderReceivePlanDetailEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        detailWrapper.eq(OrderReceivePlanDetailEntity::getOrderId,orderId);
-        detailWrapper.last("limit 1");
-        List<OrderReceivePlanDetailEntity> planDetails = orderReceivePlanDetailService.list(detailWrapper);
-
-        List<OrderReceivePlanDetailVO> receivePlanDetaills =new ArrayList<>();
-        for (OrderReceivePlanDetailEntity detail : planDetails) {
-            OrderReceivePlanDetailVO record = new OrderReceivePlanDetailVO();
-            BeanUtils.copyProperties(detail,record);
-            receivePlanDetaills.add(record);
-        }
-
-        planVO.setPlanDetails(receivePlanDetaills);
-
-        LambdaQueryWrapper<OrderReceiveRecordEntity> reWrapper = new LambdaQueryWrapper();
-        reWrapper.eq(OrderReceiveRecordEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        reWrapper.eq(OrderReceiveRecordEntity::getPlanId,orderId);
-        reWrapper.last("limit 1");
-        List<OrderReceiveRecordEntity> details = orderReceiveRecordService.list(reWrapper);
-
-        List<OrderReceiveRecordVO> receiveDetaills =new ArrayList<>();
-        for (OrderReceiveRecordEntity detail : details) {
-            OrderReceiveRecordVO record = new OrderReceiveRecordVO();
-            BeanUtils.copyProperties(detail,record);
-            receiveDetaills.add(record);
-        }
-        planVO.setReceiveDetails(receiveDetaills);
-
-        return Result.result(planVO);
-    }
-
-    @ApiOperation(value = "创建回款计划")
-    @PostMapping( "/generate_plan")
-    public Result<?> generate_plan(@RequestBody OrderReceivePlanDTO dto) {
-        if (Objects.isNull(dto)) {
-            return Result.error("参数错误");
-        }
-
-        LocalDate firstReceiveDate = dto.getFirstReceiveDate();
-        Integer receivePeriodTotal =dto.getReceivePeriodTotal();
-        LocalDate receiveDate = firstReceiveDate;
-        BigDecimal receiveAmount = dto.getPlanReceiveAmount();
-        BigDecimal leaveOrderAmount = receiveAmount;
-        BigDecimal periodAmount =  receiveAmount.divide(BigDecimal.valueOf(receivePeriodTotal),2, RoundingMode.HALF_UP);
-        BigDecimal percentage = periodAmount.divide(receiveAmount, 2, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
-        BigDecimal receiveRatio =  percentage ;
-        BigDecimal lastReceiveRatio = BigDecimal.valueOf(100) ;
-
-        List<ReceivePlanDetailVO> planDetails = new ArrayList<>();
-        for(int periodNum =1; periodNum <= receivePeriodTotal ;periodNum++) {
-            ReceivePlanDetailVO record = new ReceivePlanDetailVO();
-            if (Integer.valueOf(0).equals(dto.getIsCreate())) {
-                // 创建
-                if (periodNum > 1) {
-                    if(Integer.valueOf(1).equals(dto.getReceiveIntervalUnit())) {
-                        receiveDate = receiveDate.plusDays(dto.getReceiveInterval());
-                    } else {
-                        receiveDate = receiveDate.plusMonths(dto.getReceiveInterval());
-                    }
-                }
-            }else  {
-                // 修改
-                if(Integer.valueOf(1).equals(dto.getReceiveIntervalUnit())) {
-                    receiveDate = receiveDate.plusDays(dto.getReceiveInterval());
-                } else {
-                    receiveDate = receiveDate.plusMonths(dto.getReceiveInterval());
-                }
-            }
-
-            if (Integer.valueOf(periodNum).equals(receivePeriodTotal)) {
-                record.setPlanReceiveAmount(leaveOrderAmount);
-                record.setReceiveRatio(lastReceiveRatio);
-            } else {
-                record.setPlanReceiveAmount(periodAmount);
-                record.setReceiveRatio(receiveRatio);
-            }
-            record.setPeriodNum(periodNum);
-            record.setPlanReceiveDate(receiveDate);
-            planDetails.add(record);
-
-            leaveOrderAmount = leaveOrderAmount.subtract(periodAmount);
-            lastReceiveRatio = lastReceiveRatio.subtract(receiveRatio);
-        }
-        return Result.ok(planDetails);
-    }
-
-    @ApiOperation(value = "创建回款计划")
-    @PostMapping( "/create_plan")
-    public Result<?> createPlan(@RequestBody OrderReceivePlanDTO dto) {
-        if (Objects.isNull(dto)) {
-            return Result.error("参数错误");
-        }
-        OrderFormEntity  order = orderFormService.getById(dto.getOrderId());
-
-        LambdaQueryWrapper<OrderReceivePlanRecordEntity> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(OrderReceivePlanRecordEntity::getOrderId,dto.getOrderId());
-        queryWrapper.eq(OrderReceivePlanRecordEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        OrderReceivePlanRecordEntity planRecord = orderReceivePlanService.getOne(queryWrapper);
-
-        if (Objects.nonNull(planRecord)) {
-            return Result.error("该订单已有回款计划，请先删除");
-        }
-
-        List<OrderReceivePlanDetailEntity> planDetails = dto.getUpdateData();
-        if (CollectionUtils.isEmpty(planDetails)) {
-            return Result.error("请创建计划详情");
-        }
-        OrderReceivePlanRecordEntity plan = new OrderReceivePlanRecordEntity();
-        plan.setOrderId(dto.getOrderId());
-        plan.setOrderAmount(order.getTotalOrderAmt());
-        plan.setReceiveAmount(order.getTotalOrderAmt());
-        plan.setReceiveIntervalUnit(dto.getReceiveIntervalUnit());
-        plan.setReceiveInterval(dto.getReceiveInterval());
-        plan.setPeriodTotal(planDetails.size());
-
-        double plReceiveAmount =  planDetails.stream().mapToDouble(e -> e.getPlanReceiveAmount().doubleValue()).sum();
-        BigDecimal receiveAmount = new BigDecimal(String.valueOf(plReceiveAmount));
-        if (receiveAmount.compareTo(order.getTotalOrderAmt()) < 0) {
-            return Result.error("订单金额与计划回款金额不一致");
-        }
-
-        LocalDate firstReceiveDate = dto.getFirstReceiveDate();
-        Integer receivePeriodTotal =dto.getReceivePeriodTotal();
-        LocalDate lastReceiveDate = firstReceiveDate;
-        BigDecimal periodAmount = order.getTotalOrderAmt().divide(BigDecimal.valueOf(receivePeriodTotal));
-        BigDecimal leaveOrderAmount = BigDecimal.valueOf(0);
-
-        for(int periodNum =1; periodNum <= planDetails.size() ;periodNum++) {
-            OrderReceivePlanDetailEntity record = planDetails.get(periodNum-1);
-            leaveOrderAmount = order.getTotalOrderAmt().multiply(periodAmount);
-            if (periodNum > 1) {
-                if(Integer.valueOf(1).equals(dto.getReceiveIntervalUnit())) {
-                    lastReceiveDate = firstReceiveDate.plusDays(dto.getReceiveInterval() * periodNum);
-                } else {
-                    lastReceiveDate = firstReceiveDate.plusMonths(dto.getReceiveInterval() * periodNum);
-                }
-            }
-            if (Integer.valueOf(periodNum).equals(dto.getReceivePeriodTotal())) {
-                record.setPlanReceiveAmount(leaveOrderAmount);
-            } else {
-                record.setPlanReceiveAmount(periodAmount);
-            }
-            record.setPeriodNum(periodNum);
-            record.setPeriodTotal(receivePeriodTotal);
-            record.setPlanReceiveDate(lastReceiveDate);
-            record.setOrderId(dto.getOrderId());
-        }
-        orderReceivePlanService.save(plan);
-        orderReceivePlanDetailService.saveOrUpdateBatch(planDetails);
-
-
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "配置回款计划")
-    @PostMapping( "/update_plan")
-    public Result<?> updatPlan(@RequestBody OrderReceivePlanDTO dto) {
-        if (Objects.isNull(dto)) {
-            return Result.error("参数错误");
-        }
-
-        LambdaQueryWrapper<OrderReceivePlanRecordEntity> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(OrderReceivePlanRecordEntity::getOrderId,dto.getOrderId());
-        queryWrapper.eq(OrderReceivePlanRecordEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        OrderReceivePlanRecordEntity plan = orderReceivePlanService.getOne(queryWrapper);
-
-        List<OrderReceivePlanDetailEntity> planDetails = dto.getUpdateData();
-
-        BigDecimal planReceiveAmount = BigDecimal.ZERO;
-        List<OrderReceivePlanDetailEntity> updatels = new ArrayList<>();
-        for (OrderReceivePlanDetailEntity planDetail : planDetails) {
-            if (ReceivePlanStatusEnum.UNSTART.getCode().equals(planDetail.getReceiveStatus())
-                    && (ApproveStatusEnum.NOT_SUBMIT_APPROVE.equals(planDetail.getApproveStatus())
-                    || ApproveStatusEnum.APPROVE_NO_PASS.equals(planDetail.getApproveStatus()))) {
-                updatels.add(planDetail);
-            }
-            if (CommonConstant.DEL_FLAG_0.equals(planDetail.getIsDelete())) {
-                planReceiveAmount = planReceiveAmount.add(planDetail.getPlanReceiveAmount());
-            }
-        }
-
-        if (CollectionUtils.isEmpty(updatels)) {
-            orderReceivePlanDetailService.saveOrUpdateBatch(updatels);
-        }
-
-        if (planReceiveAmount.compareTo(plan.getReceiveAmount()) < 0) {
-            return Result.error("回款金额需要与订单金额一致");
-        }
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "删除回款计划")
-    @PostMapping( "/delete_plan_detail")
-    public Result<?> deletePlanDetail(@RequestBody OrderReceivePlanDTO dto) {
-        if (Objects.isNull(dto)) {
-            return Result.error("参数错误");
-        }
-        LambdaQueryWrapper<OrderReceivePlanRecordEntity> planWrapper = new LambdaQueryWrapper();
-        planWrapper.eq(OrderReceivePlanRecordEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        planWrapper.eq(OrderReceivePlanRecordEntity::getOrderId, dto.getOrderId());
-        planWrapper.last("limit 1");
-        OrderReceivePlanRecordEntity  receivePlan = orderReceivePlanService.getOne(planWrapper);
-        if (Objects.isNull(receivePlan)) {
-            return Result.error("receivePlan");
-        }
-        LambdaQueryWrapper<OrderReceivePlanDetailEntity> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(OrderReceivePlanDetailEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        List<OrderReceivePlanDetailEntity> planDetails = orderReceivePlanDetailService.list(queryWrapper);
-
-        if (CollectionUtils.isEmpty(planDetails)) {
-            return Result.error("参数错误");
-        }
-
-        Boolean isCanCreate = true;
-        for (OrderReceivePlanDetailEntity p : planDetails) {
-            if (!TaskStatusEnum.UNSTART.getCode().equals(p.getReceiveStatus())); {
-                isCanCreate = false;
-            }
-        }
-        if (!isCanCreate) {
-            return Result.error("该订单已有回款计划在进行中，无法删除!");
-        }
-        List<Long> ids = planDetails.stream().map(OrderReceivePlanDetailEntity::getId).collect(Collectors.toList());
-        orderReceivePlanService.lgDelete(ids);
-        if (Objects.nonNull(receivePlan)) {
-            orderReceivePlanService.lgDelete(receivePlan.getId());
-        }
-        return Result.ok();
-    }
-
-
-
-//    @ApiOperation(value = "创建回款计划")
-//    @PostMapping( "/create_plan")
-//    public Result<?> list(@RequestBody OrderReceivePlanDTO dto) {
-//        if (Objects.isNull(dto.getcustomerId())) {
-//            return Result.error("参数错误");
-//        }
-//        if (Objects.isNull(dto.getOrderId())) {
-//            return Result.error("参数错误");
-//        }
-//        OrderFormEntity order = orderFormService.getById(dto.getOrderId());
-//        LocalDate firstReceiveDate = dto.getFirstReceiveDate();
-//        Integer receivePeriodTotal =dto.getReceivePeriodTotal();
-//        LocalDate lastReceiveDate = firstReceiveDate;
-//        BigDecimal periodAmount =  order.getOrderAmount().divide(BigDecimal.valueOf(receivePeriodTotal));
-//        BigDecimal leaveOrderAmount = BigDecimal.valueOf(0);
-//        for(int periodNum =1; periodNum <= dto.getReceivePeriodTotal() ;periodNum++) {
-//            OrderReceivePlanRecordEntity record = new OrderReceivePlanRecordEntity();
-//            if (periodNum > 1) {
-//                if(Integer.valueOf(1).equals(dto.getReceiveIntervalUnit())) {
-//                    lastReceiveDate = firstReceiveDate.plusDays(dto.getReceiveInterval() * periodNum);
-//                } else {
-//                    lastReceiveDate = firstReceiveDate.plusMonths(dto.getReceiveInterval() * periodNum);
-//                }
-//            }
-//            leaveOrderAmount = order.getOrderAmount().multiply(periodAmount);
-//            if (Integer.valueOf(periodNum).equals(dto.getReceivePeriodTotal())) {
-//                record.setPlanReceiveAmount(leaveOrderAmount);
-//            } else {
-//                record.setPlanReceiveAmount(periodAmount);
-//            }
-//            record.setPeriodNum(periodNum);
-//            record.setPeriodTotal(receivePeriodTotal);
-//            record.setPlanReceiveDate(lastReceiveDate);
-//            record.setOrderId(dto.getOrderId());
-//        }
-//
-//        return Result.ok();
-//    }
-}

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/finance/OrderReceiveRecordApiController.java

@@ -1,94 +0,0 @@
-package com.storlead.sales.controller.finance;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.storlead.framework.common.constant.CodeGenerateInterface;
-import com.storlead.framework.common.constant.CommonConstant;
-import com.storlead.framework.common.util.generate.CodeGenerate;
-import com.storlead.framework.common.result.Result;
-import com.storlead.sales.enums.ApproveStatusEnum;
-import com.storlead.sales.pojo.dto.finance.OrderReceivePlanQueryDTO;
-import com.storlead.sales.pojo.entity.finance.OrderReceiveRecordEntity;
-import com.storlead.sales.service.finance.OrderReceiveRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * @program: sp-sales-platform
- * @description:
- * @author: chenkq
- * @create: 2024-07-31 14:31
- */
-@Api(tags = "财务: 回款记录")
-@RestController
-@RequestMapping("/finance/receive")
-public class OrderReceiveRecordApiController {
-    @Resource
-    private OrderReceiveRecordService receiveRecordService;
-
-    @ApiOperation(value = "获取回款记录")
-    @PostMapping( "/list_page")
-    public Result<?> list(@RequestBody OrderReceivePlanQueryDTO dto) {
-        IPage<OrderReceiveRecordEntity> page = new Page<>(dto.getPageIndex(),dto.getPageSize());
-        LambdaQueryWrapper<OrderReceiveRecordEntity> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(OrderReceiveRecordEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        IPage<OrderReceiveRecordEntity> pageList = receiveRecordService.page(page,queryWrapper);
-        return Result.result(pageList);
-    }
-
-    @ApiOperation(value = "保存汇款记录")
-    @PostMapping( "/save")
-    public Result<?> save(@RequestBody OrderReceiveRecordEntity record) {
-        if (Objects.isNull(record.getId())) {
-            record.setDataCode(CodeGenerate.generate12Code(CodeGenerateInterface.ORDER_RECEIVE_CODE));
-        }
-        receiveRecordService.saveOrUpdate(record);
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "获取详情")
-    @PostMapping( "/get_detial")
-    public Result<?> getDetail(Long id) {
-        OrderReceiveRecordEntity record = receiveRecordService.getById(id);
-        if (Objects.isNull(record)) {
-            return Result.error("回款记录不存在");
-        }
-        return Result.ok(record);
-    }
-
-
-    @ApiOperation(value = "删除回款记录")
-    @PostMapping( "/delete")
-    public Result<?> delete(Long id) {
-        OrderReceiveRecordEntity record = receiveRecordService.getById(id);
-        if (Objects.isNull(record)) {
-            return Result.error("回款记录不存在");
-        }
-        if (ApproveStatusEnum.APPROVE_NO_PASS.getCode().equals(record.getApproveStatus())
-                || ApproveStatusEnum.APPROVE_ING.getCode().equals(record.getApproveStatus())
-                || ApproveStatusEnum.NOT_SUBMIT_APPROVE.getCode().equals(record.getApproveStatus())
-        ) {
-            receiveRecordService.lgDelete(id);
-        } else {
-            return Result.error("回款记录已审批通过，不能删除");
-        }
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "批量除发票")
-    @PostMapping( "/deleteIds")
-    public Result<?> deleteIds(Long [] ids) {
-        receiveRecordService.lgDelete(Arrays.asList(ids));
-        return Result.ok();
-    }
-
-}

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/finance/OrderRefundRecordApiController.java

@@ -1,93 +0,0 @@
-package com.storlead.sales.controller.finance;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.storlead.framework.common.constant.CodeGenerateInterface;
-import com.storlead.framework.common.constant.CommonConstant;
-import com.storlead.framework.common.util.generate.CodeGenerate;
-import com.storlead.framework.common.result.Result;
-import com.storlead.sales.enums.ApproveStatusEnum;
-import com.storlead.sales.pojo.dto.finance.OrderReceivePlanQueryDTO;
-import com.storlead.sales.pojo.entity.finance.OrderRefundRecordEntity;
-import com.storlead.sales.service.finance.OrderRefundRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * @program: sp-sales-platform
- * @description: 退款管理
- * @author: chenkq
- * @create: 2024-07-31 14:53
- */
-@Api(tags = "财务: 退款")
-@RestController
-@RequestMapping("/finance/refund")
-public class OrderRefundRecordApiController {
-    @Resource
-    private OrderRefundRecordService refundRecordService;
-
-    @ApiOperation(value = "获取退费记录")
-    @PostMapping( "/list_page")
-    public Result<?> list(@RequestBody OrderReceivePlanQueryDTO dto) {
-        IPage<OrderRefundRecordEntity> page = new Page<>(dto.getPageIndex(),dto.getPageSize());
-        LambdaQueryWrapper<OrderRefundRecordEntity> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(OrderRefundRecordEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        IPage<OrderRefundRecordEntity> pageList = refundRecordService.page(page,queryWrapper);
-        return Result.result(pageList);
-    }
-
-    @ApiOperation(value = "保存退费记录")
-    @PostMapping( "/save")
-    public Result<?> save(@RequestBody OrderRefundRecordEntity record) {
-        if (Objects.isNull(record.getId())) {
-            record.setDataCode(CodeGenerate.generate12Code(CodeGenerateInterface.ORDER_REFUND_CODE));
-        }
-        refundRecordService.saveOrUpdate(record);
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "获取详情")
-    @PostMapping( "/get_detial")
-    public Result<?> getDetail(Long id) {
-        OrderRefundRecordEntity record = refundRecordService.getById(id);
-        if (Objects.isNull(record)) {
-            return Result.error("回款记录不存在");
-        }
-        return Result.ok(record);
-    }
-
-
-    @ApiOperation(value = "删除退费记录")
-    @PostMapping( "/delete")
-    public Result<?> delete(Long id) {
-        OrderRefundRecordEntity record = refundRecordService.getById(id);
-        if (Objects.isNull(record)) {
-            return Result.error("退费记录不存在");
-        }
-        if (ApproveStatusEnum.APPROVE_NO_PASS.getCode().equals(record.getApproveStatus())
-                || ApproveStatusEnum.APPROVE_ING.getCode().equals(record.getApproveStatus())
-                || ApproveStatusEnum.NOT_SUBMIT_APPROVE.getCode().equals(record.getApproveStatus())
-        ) {
-            refundRecordService.lgDelete(id);
-        } else {
-            return Result.error("回款记录已审批通过，不能删除");
-        }
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "批量除退费记录")
-    @PostMapping( "/deleteIds")
-    public Result<?> deleteIds(Long [] ids) {
-        refundRecordService.lgDelete(Arrays.asList(ids));
-        return Result.ok();
-    }
-}

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/finance/ReimburseBillApiController.java

@@ -1,94 +0,0 @@
-package com.storlead.sales.controller.finance;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.storlead.framework.common.constant.CodeGenerateInterface;
-import com.storlead.framework.common.constant.CommonConstant;
-import com.storlead.framework.common.util.generate.CodeGenerate;
-import com.storlead.framework.common.result.Result;
-import com.storlead.sales.enums.ApproveStatusEnum;
-import com.storlead.sales.pojo.dto.finance.OrderReceivePlanQueryDTO;
-import com.storlead.sales.pojo.entity.finance.ReimburseBillRecordEntity;
-import com.storlead.sales.service.finance.ReimburseBillRecordService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.Arrays;
-import java.util.Objects;
-
-/**
- * @program: sp-sales-platform
- * @description:
- * @author: chenkq
- * @create: 2024-07-31 15:14
- */
-@Api(tags = "财务: 报销")
-@RestController
-@RequestMapping("/finance/reimburse")
-public class ReimburseBillApiController {
-
-    @Resource
-    private ReimburseBillRecordService reimburseBillRecordService;
-
-    @ApiOperation(value = "获取报销记录")
-    @PostMapping( "/list_page")
-    public Result<?> list(@RequestBody OrderReceivePlanQueryDTO dto) {
-        IPage<ReimburseBillRecordEntity> page = new Page<>(dto.getPageIndex(),dto.getPageSize());
-        LambdaQueryWrapper<ReimburseBillRecordEntity> queryWrapper = new LambdaQueryWrapper();
-        queryWrapper.eq(ReimburseBillRecordEntity::getIsDelete, CommonConstant.DEL_FLAG_0);
-        IPage<ReimburseBillRecordEntity> pageList = reimburseBillRecordService.page(page,queryWrapper);
-        return Result.result(pageList);
-    }
-
-    @ApiOperation(value = "保存报销记录")
-    @PostMapping( "/save")
-    public Result<?> save(@RequestBody ReimburseBillRecordEntity record) {
-        if (Objects.isNull(record.getId())) {
-            record.setDataCode(CodeGenerate.generate12Code(CodeGenerateInterface.ORDER_REIMBURSE_BILL_CODE));
-        }
-        reimburseBillRecordService.saveOrUpdate(record);
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "获取详情")
-    @PostMapping( "/get_detial")
-    public Result<?> getDetail(Long id) {
-        ReimburseBillRecordEntity record = reimburseBillRecordService.getById(id);
-        if (Objects.isNull(record)) {
-            return Result.error("费用记录不存在");
-        }
-        return Result.ok(record);
-    }
-
-
-    @ApiOperation(value = "删除报销记录")
-    @PostMapping( "/delete")
-    public Result<?> delete(Long id) {
-        ReimburseBillRecordEntity record = reimburseBillRecordService.getById(id);
-        if (Objects.isNull(record)) {
-            return Result.error("报销记录不存在");
-        }
-        if (ApproveStatusEnum.APPROVE_NO_PASS.getCode().equals(record.getApproveStatus())
-                || ApproveStatusEnum.APPROVE_ING.getCode().equals(record.getApproveStatus())
-                || ApproveStatusEnum.NOT_SUBMIT_APPROVE.getCode().equals(record.getApproveStatus())
-        ) {
-            reimburseBillRecordService.lgDelete(id);
-        } else {
-            return Result.error("报销记录已审批通过，不能删除");
-        }
-        return Result.ok();
-    }
-
-    @ApiOperation(value = "批量删除报销记录")
-    @PostMapping( "/deleteIds")
-    public Result<?> deleteIds(Long [] ids) {
-        reimburseBillRecordService.lgDelete(Arrays.asList(ids));
-        return Result.ok();
-    }
-}

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/mail/MailApiController.java

@@ -77,7 +77,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/mail")
-@Api(tags = "020.邮件管理相关接口")
+@Api(tags = "邮件: 邮件管理")
 @Log4j2
 public class MailApiController {
 

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/material/MaterialEntryRecordApiController.java

@@ -45,7 +45,7 @@ import java.util.stream.Collectors;
 @Log4j2
 @RestController
 @RequestMapping("/material")
-@Api(tags="物料进出记录")
+@Api(tags="销售: 物料进出记录")
 public class MaterialEntryRecordApiController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/message/MessageApiController.java

@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/sys/inside/message")
-@Api(tags = "消息系统： 站内消息相关接口")
+@Api(tags = "消息: 站内消息相关接口")
 public class MessageApiController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/report/CustomerAttributeAnalysisApiController.java

@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
   */
 @RestController
 @RequestMapping("/customer/attribute")
-@Api(tags = "022统计模块相关接口")
+@Api(tags = "报表: 客户属性统计")
 public class CustomerAttributeAnalysisApiController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/report/DashboardSketchApiController.java

@@ -41,7 +41,7 @@ import java.util.Set;
  */
 @RestController
 @RequestMapping("/dashboard/sketch")
-@Api(tags = "数据播报")
+@Api(tags = "报表: 数据播报")
 public class DashboardSketchApiController {
 
     @Resource
@@ -60,7 +60,7 @@ public class DashboardSketchApiController {
     private ISubCompanyService subCompanyService;
 
     @PostMapping(value = "/get_report")
-    @ApiOperation(value = "获取数据播报-分页")
+    @ApiOperation(value = "获取报表: 数据播报-分页")
     public Result<IPage<DashboardSketchPageVO>> getReport(DashboardSketchDTO dto) {
         // 根据组织类型获取对应的数据权限范围
         OrganizationalTypeEnum scopeType = getDataScopeType(dto.getOrganizationType());
@@ -161,7 +161,7 @@ public class DashboardSketchApiController {
     }
 
     @PostMapping(value = "/get_report_total")
-    @ApiOperation(value = "获取数据播报-数据总和")
+    @ApiOperation(value = "获取报表: 数据播报-数据总和")
     public Result<DashboardSketchVO> getReportTotal(DashboardSketchDTO dto) {
         // 根据组织类型获取对应的数据权限范围
         OrganizationalTypeEnum scopeType = getDataScopeType(dto.getOrganizationType());

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/report/HomeDataAnalysisApiController.java

@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/analysis/report/home")
-@Api(tags = "报表模块： 数据分析报表功能过")
+@Api(tags = "报表: 数据分析报表")
 public class HomeDataAnalysisApiController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/report/SalesCustomerDataAnalysisApiController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/customer/analysis")
-@Api(tags = "报表模块: 客户数据分析")
+@Api(tags = "报表: 客户数据分析")
 public class SalesCustomerDataAnalysisApiController {
 
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/report/SalesDataAnalysisApiController.java

@@ -12,6 +12,6 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/analysis/report")
-@Api(tags = "报表模块： 数据分析报表功能过")
+@Api(tags = "报表: 数据分析报表")
 public class SalesDataAnalysisApiController {
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/report/SalesPerformanceAnalysisApiController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/performance/analysis")
-@Api(tags = "报表模块: 销售过程分析")
+@Api(tags = "报表: 销售过程分析")
 public class SalesPerformanceAnalysisApiController {
 
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/report/SalesProcessAnalysisApiController.java

@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/process/analysis")
-@Api(tags = "报表模块: 销售过程统计")
+@Api(tags = "报表: 销售过程统计")
 public class SalesProcessAnalysisApiController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/report/SalesRankingAnalysisApiController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/ranking/analysis")
-@Api(tags = "报表模块: 销售排名分析")
+@Api(tags = "报表: 销售排名分析")
 public class SalesRankingAnalysisApiController  {
 
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/sku/QuotationController.java

@@ -43,7 +43,7 @@ import java.util.*;
  */
 @RestController
 @RequestMapping("/quotation")
-@Api(tags = "009.报价单相关接口")
+@Api(tags = "销售: 报价单相关接口")
 @Log4j2
 public class QuotationController {
 

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/sku/SkuDetailController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/sku-detail")
-@Api(tags = "009.报价单相关接口")
+@Api(tags = "销售: 报价单相关接口")
 public class SkuDetailController {
 
 }

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/sku/SsdskuController.java

@@ -37,7 +37,7 @@ import java.util.*;
  */
 @RestController
 @RequestMapping("/sku")
-@Api(tags = "008.产品管理相关接口")
+@Api(tags = "销售: 产品管理相关接口")
 public class SsdskuController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/systemrule/ApproveController.java

@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/approve")
-@Api(tags = "015.审核相关接口")
+@Api(tags = "销售: 审核相关接口")
 public class ApproveController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/systemrule/ApproveLogController.java

@@ -24,7 +24,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/approve-log")
-@Api(tags = "015.审核相关接口")
+@Api(tags = "销售: 审核相关接口")
 public class ApproveLogController {
     @Resource
     private ApproveLogService approveLogService;

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/systemrule/ApproveNodeController.java

@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/approve-node")
-@Api(tags = "015.审核相关接口")
+@Api(tags = "销售: 审核相关接口")
 public class ApproveNodeController {
     @Resource
     private ApproveNodeService approveNodeService;

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/systemrule/CurrencySettingsController.java

@@ -39,7 +39,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/currency-settings-entity")
-@Api(tags = "007.币种设置相关接口")
+@Api(tags = "销售: 币种设置相关接口")
 public class CurrencySettingsController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/systemrule/OperationLogController.java

@@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/operation-log")
-@Api(tags = "013.通用日志管理相关接口")
+@Api(tags = "销售: 通用日志管理相关接口")
 public class OperationLogController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/systemrule/SystemRuleConfigController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/system-rule-config")
-@Api(tags = "001.系统配置相关接口")
+@Api(tags = "销售: 系统配置相关接口")
 public class SystemRuleConfigController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/systemrule/SystemRuleModuleConfigController.java

@@ -36,7 +36,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/system-rule-module-config")
-@Api(tags = "001.系统配置相关接口")
+@Api(tags = "销售: 系统配置相关接口")
 public class SystemRuleModuleConfigController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/target/TargetPlanController.java

@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/target-plan")
-@Api(tags = "016.业绩目标管理相关接口")
+@Api(tags = "销售: 业绩目标管理相关接口")
 public class TargetPlanController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/target/TargetQuotaController.java

@@ -25,7 +25,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/target-quota")
-@Api(tags = "016.业绩目标管理相关接口")
+@Api(tags = "销售: 业绩目标管理相关接口")
 public class TargetQuotaController {
 
     @Resource

java/storlead-sasa/storlead-sales/src/main/java/com/storlead/sales/controller/task/TestApiController.java

@@ -44,7 +44,7 @@ import java.util.stream.Collectors;
  * @author: chenkq
  * @create: 2024-09-29 18:27
  */
-@Api(tags = "测试模块: 测试模块")
+@Api(tags = "测试: 测试模块")
 @Log4j2
 @RestController
 @RequestMapping("/sys/test")

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/controller/CustomerAiAnalysisController.java

@@ -23,7 +23,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/customer/analysis")
-@Api(tags = "客户AI分析")
+@Api(tags = "营销: 客户AI分析")
 public class CustomerAiAnalysisController {
 
     @Resource
@@ -33,7 +33,7 @@ public class CustomerAiAnalysisController {
     private CustomerAnalysisResultEntityService customerAnalysisResultEntityService;
 
     @PostMapping("/single")
-    @ApiOperation("单客户AI分析并保存结果")
+    @ApiOperation("单营销: 客户AI分析并保存结果")
     public Result<Object> analyzeSingle(@RequestBody CustomerSingleAnalysisRequestDTO request) {
         if (request == null || request.getCustomerId() == null) {
             return Result.error("customerId不能为空");

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/controller/MarketingController.java

@@ -18,13 +18,13 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/marketing")
-@Api(tags = "营销活动")
+@Api(tags = "营销: 营销活动")
 public class MarketingController {
 
     @Autowired
     private MarketingCampaignEntityService marketingService;
     @RequestMapping("/list")
-    @ApiOperation("营销活动列表")
+    @ApiOperation("营销: 营销活动列表")
     public Result<Object> list(@RequestBody MarketingCampaignDTO marketingCampaignDTO) {
 
         Result<Object> result = marketingService.getList(marketingCampaignDTO);
@@ -32,7 +32,7 @@ public class MarketingController {
     }
 
     @PostMapping(value = "/add")
-    @ApiOperation(value = "营销活动添加", notes = "营销活动添加简报")
+    @ApiOperation(value = "营销: 营销活动添加", notes = "营销: 营销活动添加简报")
     @Transactional(rollbackFor = Throwable.class)
     public Result<?> add(@RequestBody MarketingCampaignDTO marketingCampaignDTO) {
         Result<Object> result = marketingService.addMarket(marketingCampaignDTO);
@@ -40,7 +40,7 @@ public class MarketingController {
     }
 
     @PostMapping(value = "/edit")
-    @ApiOperation(value = "营销活动修改", notes = "营销活动修改")
+    @ApiOperation(value = "营销: 营销活动修改", notes = "营销: 营销活动修改")
     @Transactional(rollbackFor = Throwable.class)
     public Result<?> edit(@RequestBody MarketingCampaignDTO marketingCampaignDTO) {
         Result<Object> result = marketingService.editMarket(marketingCampaignDTO);
@@ -48,7 +48,7 @@ public class MarketingController {
     }
 
     @PostMapping(value = "/delete")
-    @ApiOperation(value = "营销活动修改", notes = "营销活动修改")
+    @ApiOperation(value = "营销: 营销活动修改", notes = "营销: 营销活动修改")
     @Transactional(rollbackFor = Throwable.class)
     public Result<?> delete(@RequestBody MarketingCampaignDTO marketingCampaignDTO) {
         boolean isOk = false;

java/storlead-sasa/storlead-trade/src/main/java/com/storlead/trade/controller/SopController.java

@@ -25,7 +25,7 @@ import java.util.List;
 @Slf4j
 @RestController
 @RequestMapping("/api/sop")
-@Api(tags = "SOP管理接口")
+@Api(tags = "营销: SOP管理")
 @Validated
 public class SopController {
 

java/storlead-sms/storlead-sms-api/src/main/java/com/storlead/sms/api/SmsCaptchaApiController.java

@@ -17,7 +17,7 @@ import javax.annotation.Resource;
 /**
  * 短信验证码 HTTP（依赖 {@link SmsCaptchaService} 契约，与实现解耦）
  */
-@Api(tags = "System-SMS -> 验证码")
+@Api(tags = "短信: 验证码")
 @RestController
 @RequestMapping("/sys/sms/captcha")
 public class SmsCaptchaApiController {

java/storlead-sms/storlead-sms-api/src/main/java/com/storlead/sms/api/SmsLogApiController.java

@@ -15,7 +15,7 @@ import javax.annotation.Resource;
 /**
  * 短信发送 HTTP 接口
  */
-@Api(tags = "System-SMS -> 短信")
+@Api(tags = "短信: 短信")
 @RestController
 @RequestMapping("/sys/sms")
 public class SmsLogApiController {

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/CompanyCustomSettingsController.java

@@ -28,7 +28,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/sys/custom/settings")
-@Api(tags = "设置: 企业个性化设置")
+@Api(tags = "系统: 企业个性化设置")
 public class CompanyCustomSettingsController {
 
 

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/DeptController.java

@@ -20,7 +20,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/lingcun/dept")
 @Slf4j
-@Api(tags="5.公共接口")
+@Api(tags="系统: 公共接口")
 public class DeptController {
 
 	@Resource

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/FileResourceController.java

@@ -41,7 +41,7 @@ import java.util.Objects;
 @Log4j2
 @RestController
 @RequestMapping("/oss/file")
-@Api(tags="051.公共接口")
+@Api(tags="系统: 公共接口")
 public class FileResourceController {
 
     @Resource

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/JobController.java

@@ -19,7 +19,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/lingcun/job")
 @Slf4j
-@Api(tags="5.公共接口")
+@Api(tags="系统: 公共接口")
 public class JobController {
 
 	@Resource

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/QuickMenuApiController.java

@@ -30,7 +30,7 @@ import java.util.stream.Collectors;
  * @author: chenkq
  * @create: 2024-04-08 17:14
  */
-@Api(tags = "系统-快捷菜单: 快捷菜单设置")
+@Api(tags = "系统: 快捷菜单设置")
 @RestController
 @RequestMapping("/sys/quick/menu")
 public class QuickMenuApiController {

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/SubCompanyController.java

@@ -22,7 +22,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/lingcun")
-@Api(tags="5.公共接口")
+@Api(tags="系统: 公共接口")
 public class SubCompanyController {
 
     @Resource

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/SysDictApiController.java

@@ -31,7 +31,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/sys/dict")
-@Api(tags="101:系统数据字典")
+@Api(tags="系统: 数据字典")
 public class SysDictApiController {
 
     @Resource

java/storlead-system/storlead-system-api/src/main/java/com/storlead/system/controller/ThumbnailPreviewController.java

@@ -30,7 +30,7 @@ import java.util.Iterator;
  */
 @RestController
 @RequestMapping("/view")
-@Api(tags = "图片显示")
+@Api(tags = "系统: 图片显示")
 @Log4j2
 public class ThumbnailPreviewController {
 

java/storlead-user/storlead-user-api/src/main/java/com/storlead/user/api/TenantEnterpriseApiController.java

@@ -15,7 +15,7 @@ import javax.annotation.Resource;
  */
 @RestController
 @RequestMapping("/sys/tenant/enterprise")
-@Api(tags = "Tenant-Enterprise -> 企业租户")
+@Api(tags = "租户: 企业租户")
 public class TenantEnterpriseApiController {
 
     @Resource

java/storlead-user/storlead-user-api/src/main/java/com/storlead/user/api/TenantUserApiController.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/sys/tenant/user")
-@Api(tags = "Tenant-User -> 租户用户")
+@Api(tags = "租户: 租户用户")
 public class TenantUserApiController {
 
     @Resource