update: 修改订单预览、提交订单相关

feifan-framework/feifan-common/src/main/java/cn/newfeifan/mall/framework/common/util/cache/CacheUtils.java

@@ -17,7 +17,7 @@ import java.util.concurrent.Executors;
 public class CacheUtils {
 
     public static <K, V> LoadingCache<K, V> buildAsyncReloadingCache(Duration duration, CacheLoader<K, V> loader) {
-        Executor executor = Executors.newCachedThreadPool(  // TODO 芋艿：可能要思考下，未来要不要做成可配置
+        Executor executor = Executors.newCachedThreadPool(  // TODO 非繁人：可能要思考下，未来要不要做成可配置
                 TtlExecutors.getDefaultDisableInheritableThreadFactory()); // TTL 保证 ThreadLocal 可以透传
         return CacheBuilder.newBuilder()
                 // 只阻塞当前数据加载线程，其他线程返回旧值

feifan-framework/feifan-spring-boot-starter-biz-data-permission/src/main/java/cn/newfeifan/mall/framework/datapermission/core/rule/dept/DeptDataPermissionRule.java

@@ -127,7 +127,7 @@ public class DeptDataPermissionRule implements DataPermissionRule {
         Expression deptExpression = buildDeptExpression(tableName,tableAlias, deptDataPermission.getDeptIds());
         Expression userExpression = buildUserExpression(tableName, tableAlias, deptDataPermission.getSelf(), loginUser.getId());
         if (deptExpression == null && userExpression == null) {
-            // TODO 芋艿：获得不到条件的时候，暂时不抛出异常，而是不返回数据
+            // TODO 非繁人：获得不到条件的时候，暂时不抛出异常，而是不返回数据
             log.warn("[getExpression][LoginUser({}) Table({}/{}) DeptDataPermission({}) 构建的条件为空]",
                     JsonUtils.toJsonString(loginUser), tableName, tableAlias, JsonUtils.toJsonString(deptDataPermission));
 //            throw new NullPointerException(String.format("LoginUser(%d) Table(%s/%s) 构建的条件为空",

feifan-framework/feifan-spring-boot-starter-biz-pay/src/main/java/cn/newfeifan/mall/framework/pay/core/client/impl/alipay/AbstractAlipayPayClient.java

@@ -240,7 +240,7 @@ public abstract class AbstractAlipayPayClient extends AbstractPayClient<AlipayPa
         PayTransferTypeEnum transferType = PayTransferTypeEnum.typeOf(reqDTO.getType());
         switch (transferType) {
             // TODO @jason：是不是不用传递 transferType 参数哈？因为应该已经明确是支付宝啦？
-            // @芋艿。 是不是还要考虑转账到银行卡。所以传 transferType 但是转账到银行卡不知道要如何测试??
+            // @非繁人。 是不是还要考虑转账到银行卡。所以传 transferType 但是转账到银行卡不知道要如何测试??
             case ALIPAY_BALANCE: {
                 payeeInfo.setIdentityType("ALIPAY_LOGON_ID");
                 payeeInfo.setIdentity(reqDTO.getAlipayLogonId()); // 支付宝登录号

feifan-framework/feifan-spring-boot-starter-biz-pay/src/main/java/cn/newfeifan/mall/framework/pay/core/client/impl/alipay/AlipayAppPayClient.java

@@ -15,7 +15,7 @@ import lombok.extern.slf4j.Slf4j;
  *
  * 文档：<a href="https://opendocs.alipay.com/open/02e7gq">App 支付</a>
  *
- * // TODO 芋艿：未详细测试，因为手头没 App
+ * // TODO 非繁人：未详细测试，因为手头没 App
  *
  * @author 非繁源码
  */

feifan-framework/feifan-spring-boot-starter-biz-pay/src/main/java/cn/newfeifan/mall/framework/pay/core/client/impl/weixin/WxAppPayClient.java

@@ -20,7 +20,7 @@ import static cn.newfeifan.mall.framework.common.util.json.JsonUtils.toJsonStrin
  *
  * 文档：<a href="https://pay.weixin.qq.com/wiki/doc/apiv3/open/pay/chapter2_5_3.shtml">App 支付</a>
  *
- * // TODO 芋艿：未详细测试，因为手头没 App
+ * // TODO 非繁人：未详细测试，因为手头没 App
  *
  * @author 非繁源码
  */

feifan-framework/feifan-spring-boot-starter-biz-tenant/src/main/java/cn/newfeifan/mall/framework/tenant/core/job/TenantJobAspect.java

@@ -41,7 +41,7 @@ public class TenantJobAspect {
         // 逐个租户，执行 Job
         Map<Long, String> results = new ConcurrentHashMap<>();
         tenantIds.parallelStream().forEach(tenantId -> {
-            // TODO 芋艿：先通过 parallel 实现并行；1）多个租户，是一条执行日志；2）异常的情况
+            // TODO 非繁人：先通过 parallel 实现并行；1）多个租户，是一条执行日志；2）异常的情况
             TenantUtils.execute(tenantId, () -> {
                 try {
                     joinPoint.proceed();

feifan-framework/feifan-spring-boot-starter-biz-tenant/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java

@@ -40,7 +40,7 @@ import static cn.newfeifan.mall.framework.web.core.util.WebFrameworkUtils.HEADER
  * {@link HandlerMethodArgumentResolver}.
  *
  * 针对 rabbitmq-spring 和 kafka-spring，不存在合适的拓展点，可以实现 Consumer 消费前，读取 Header 中的 tenant-id 设置到 {@link TenantContextHolder} 中
- * TODO 芋艿：持续跟进，看看有没新的拓展点
+ * TODO 非繁人：持续跟进，看看有没新的拓展点
  *
  * @author Rossen Stoyanchev
  * @author Juergen Hoeller

feifan-framework/feifan-spring-boot-starter-monitor/src/main/java/cn/newfeifan/mall/framework/tracer/config/FeifanTracerAutoConfiguration.java

@@ -21,7 +21,7 @@ import org.springframework.context.annotation.Bean;
 @ConditionalOnProperty(prefix = "feifan.tracer", value = "enable", matchIfMissing = true)
 public class FeifanTracerAutoConfiguration {
 
-    // TODO @芋艿：重要。目前 opentracing 版本存在冲突，要么保证 skywalking，要么保证阿里云短信 sdk
+    // TODO @非繁人：重要。目前 opentracing 版本存在冲突，要么保证 skywalking，要么保证阿里云短信 sdk
 //    @Bean
 //    public TracerProperties bizTracerProperties() {
 //        return new TracerProperties();

feifan-framework/feifan-spring-boot-starter-mq/src/main/java/cn/newfeifan/mall/framework/mq/redis/core/stream/AbstractRedisStreamMessageListener.java

@@ -63,7 +63,7 @@ public abstract class AbstractRedisStreamMessageListener<T extends AbstractRedis
             this.onMessage(messageObj);
             // ack 消息消费完成
             redisMQTemplate.getRedisTemplate().opsForStream().acknowledge(group, message);
-            // TODO 芋艿：需要额外考虑以下几个点：
+            // TODO 非繁人：需要额外考虑以下几个点：
             // 1. 处理异常的情况
             // 2. 发送日志；以及事务的结合
             // 3. 消费日志；以及通用的幂等性

feifan-framework/feifan-spring-boot-starter-mybatis/src/main/java/cn/newfeifan/mall/framework/mybatis/config/IdTypeEnvironmentPostProcessor.java

@@ -39,7 +39,7 @@ public class IdTypeEnvironmentPostProcessor implements EnvironmentPostProcessor
         }
 
         // 设置 Quartz JobStore 对应的 Driver
-        // TODO 芋艿：暂时没有找到特别合适的地方，先放在这里
+        // TODO 非繁人：暂时没有找到特别合适的地方，先放在这里
         setJobStoreDriverIfPresent(environment, dbType);
 
         // 初始化 SQL 静态变量

feifan-framework/feifan-spring-boot-starter-mybatis/src/main/java/cn/newfeifan/mall/framework/mybatis/core/query/QueryWrapperX.java

@@ -142,7 +142,7 @@ public class QueryWrapperX<T> extends QueryWrapper<T> {
     /**
      * 设置只返回最后一条
      *
-     * TODO 芋艿：不是完美解，需要在思考下。如果使用多数据源，并且数据源是多种类型时，可能会存在问题：实现之返回一条的语法不同
+     * TODO 非繁人：不是完美解，需要在思考下。如果使用多数据源，并且数据源是多种类型时，可能会存在问题：实现之返回一条的语法不同
      *
      * @return this
      */

feifan-module-bpm/feifan-module-bpm-api/src/main/java/cn/newfeifan/mall/module/bpm/enums/definition/BpmTaskRuleScriptEnum.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 
 /**
  * BPM 任务规则的脚本枚举
- * 目前暂时通过 TODO 芋艿：硬编码，未来可以考虑 Groovy 动态脚本的方式
+ * 目前暂时通过 TODO 非繁人：硬编码，未来可以考虑 Groovy 动态脚本的方式
  *
  * @author 非繁源码
  */

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/controller/admin/task/vo/instance/BpmProcessInstanceRespVO.java

@@ -54,7 +54,7 @@ public class BpmProcessInstanceRespVO {
 
         @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
         private Long id;
-        @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+        @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁人")
         private String nickname;
 
         @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/controller/admin/task/vo/task/BpmTaskRespVO.java

@@ -35,7 +35,7 @@ public class BpmTaskRespVO extends BpmTaskDonePageItemRespVO {
 
         @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
         private Long id;
-        @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+        @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁人")
         private String nickname;
 
         @Schema(description = "部门编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageItemRespVO.java

@@ -42,7 +42,7 @@ public class BpmTaskTodoPageItemRespVO {
         @Schema(description = "发起人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
         private Long startUserId;
 
-        @Schema(description = "发起人的用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+        @Schema(description = "发起人的用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁人")
         private String startUserNickname;
 
         @Schema(description = "流程定义的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/convert/cc/BpmProcessInstanceCopyConvert.java

@@ -15,7 +15,7 @@ import java.util.Map;
 /**
  * 动态表单 Convert
  *
- * @author 芋艿
+ * @author 非繁人
  */
 @Mapper
 public interface BpmProcessInstanceCopyConvert {

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/convert/definition/BpmFormConvert.java

@@ -14,7 +14,7 @@ import java.util.List;
 /**
  * 动态表单 Convert
  *
- * @author 芋艿
+ * @author 非繁人
  */
 @Mapper
 public interface BpmFormConvert {

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/convert/oa/BpmOALeaveConvert.java

@@ -12,7 +12,7 @@ import java.util.List;
 /**
  * 请假申请 Convert
  *
- * @author 芋艿
+ * @author 非繁人
  */
 @Mapper
 public interface BpmOALeaveConvert {

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/dal/dataobject/definition/BpmTaskMessageRuleDO.java

@@ -1,5 +1,5 @@
 package cn.newfeifan.mall.module.bpm.dal.dataobject.definition;
 
-// TODO 芋艿：先埋个坑。任务消息的配置规则。说白了，就是不同的
+// TODO 非繁人：先埋个坑。任务消息的配置规则。说白了，就是不同的
 public class BpmTaskMessageRuleDO {
 }

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/dal/dataobject/task/BpmProcessInstanceExtDO.java

@@ -92,7 +92,7 @@ public class BpmProcessInstanceExtDO extends BaseDO {
     /**
      * 提前设定好的审批人
      */
-    @TableField(typeHandler = JacksonTypeHandler.class, exist = false) // TODO 芋艿：临时 exist = false，避免 db 报错；
+    @TableField(typeHandler = JacksonTypeHandler.class, exist = false) // TODO 非繁人：临时 exist = false，避免 db 报错；
     private Map<String, List<Long>> assignee;
 
 }

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/framework/bpm/config/BpmCandidateProcessorConfiguration.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-// TODO @芋艿：Candidate 相关还在完善中，用户可以暂时忽略，仅 feifan 开发的同学需要关注~计划是把 Candidate 和 Assign 融合成一套
+// TODO @非繁人：Candidate 相关还在完善中，用户可以暂时忽略，仅 feifan 开发的同学需要关注~计划是把 Candidate 和 Assign 融合成一套
 /**
  * BPM 通用的 Configuration 配置类，提供给 Activiti 和 Flowable
  * @author kyle

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/service/cc/BpmProcessInstanceCopyService.java

@@ -24,7 +24,7 @@ public interface BpmProcessInstanceCopyService {
      */
     BpmProcessInstanceCopyVO queryById(Long copyId);
 
-    // TODO 芋艿：这块要 review 下；思考下~~
+    // TODO 非繁人：这块要 review 下；思考下~~
     /**
      * 抄送
      * @param sourceInfo 抄送源信息，方便抄送处理

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/service/definition/BpmFormServiceImpl.java

@@ -112,7 +112,7 @@ public class BpmFormServiceImpl implements BpmFormService {
      * @param fields field 数组
      */
     private void checkFields(List<String> fields) {
-        if (true) { // TODO 芋艿：兼容 Vue3 工作流：因为采用了新的表单设计器，所以暂时不校验
+        if (true) { // TODO 非繁人：兼容 Vue3 工作流：因为采用了新的表单设计器，所以暂时不校验
             return;
         }
         Map<String, String> fieldMap = new HashMap<>(); // key 是 vModel，value 是 label

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/service/definition/BpmModelServiceImpl.java

@@ -160,7 +160,7 @@ public class BpmModelServiceImpl implements BpmModelService {
             throw exception(MODEL_NOT_EXISTS);
         }
         // 1.2 校验流程图
-        // TODO 芋艿：校验流程图的有效性；例如说，是否有开始的元素，是否有结束的元素；
+        // TODO 非繁人：校验流程图的有效性；例如说，是否有开始的元素，是否有结束的元素；
         byte[] bpmnBytes = repositoryService.getModelEditorSource(model.getId());
         if (bpmnBytes == null) {
             throw exception(MODEL_NOT_EXISTS);

feifan-module-bpm/feifan-module-bpm-biz/src/main/java/cn/newfeifan/mall/module/bpm/service/message/BpmMessageService.java

@@ -9,7 +9,7 @@ import javax.validation.Valid;
 /**
  * BPM 消息 Service 接口
  *
- * TODO 芋艿：未来支持消息的可配置；不同的流程，在什么场景下，需要发送什么消息，消息的内容是什么；
+ * TODO 非繁人：未来支持消息的可配置；不同的流程，在什么场景下，需要发送什么消息，消息的内容是什么；
  *
  * @author 非繁源码
  */

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/controller/admin/contact/vo/CrmContactPageReqVO.java

@@ -14,7 +14,7 @@ import lombok.ToString;
 @ToString(callSuper = true)
 public class CrmContactPageReqVO extends PageParam {
 
-    @Schema(description = "姓名", example = "芋艿")
+    @Schema(description = "姓名", example = "非繁人")
     private String name;
 
     @Schema(description = "客户编号", example = "10795")

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/controller/admin/contact/vo/CrmContactRespVO.java

@@ -20,7 +20,7 @@ public class CrmContactRespVO {
     @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "3167")
     private Long id;
 
-    @Schema(description = "姓名", example = "芋艿")
+    @Schema(description = "姓名", example = "非繁人")
     @ExcelProperty(value = "姓名", order = 1)
     private String name;
 

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/controller/admin/contact/vo/CrmContactSaveReqVO.java

@@ -22,7 +22,7 @@ public class CrmContactSaveReqVO {
     @Schema(description = "主键", example = "3167")
     private Long id;
 
-    @Schema(description = "姓名", example = "芋艿")
+    @Schema(description = "姓名", example = "非繁人")
     @NotNull(message = "姓名不能为空")
     @DiffLogField(name = "姓名")
     private String name;

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/controller/admin/contract/vo/CrmContractRespVO.java

@@ -44,7 +44,7 @@ public class CrmContractRespVO {
     @ExcelProperty("负责人的用户编号")
     private Long ownerUserId;
 
-    // TODO @芋艿：未来应该支持自动生成；
+    // TODO @非繁人：未来应该支持自动生成；
     @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20230101")
     @ExcelProperty("合同编号")
     private String no;

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/controller/admin/contract/vo/CrmContractSaveReqVO.java

@@ -50,7 +50,7 @@ public class CrmContractSaveReqVO {
     @NotNull(message = "负责人不能为空")
     private Long ownerUserId;
 
-    // TODO @芋艿：未来应该支持自动生成；
+    // TODO @非繁人：未来应该支持自动生成；
     @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "20230101")
     @DiffLogField(name = "合同编号")
     @NotNull(message = "合同编号不能为空")

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/controller/admin/message/CrmMessageController.java

@@ -30,7 +30,7 @@ public class CrmMessageController {
     @Resource
     private CrmMessageService crmMessageService;
 
-    // TODO 芋艿：未来可能合并到 CrmCustomerController
+    // TODO 非繁人：未来可能合并到 CrmCustomerController
     @GetMapping("/todayCustomer") // TODO @dbh52：【优先级低】url 使用中划线，项目规范。然后叫 today-customer-page，通过 page 体现出它是个分页接口
     @Operation(summary = "今日需联系客户")
     @PreAuthorize("@ss.hasPermission('crm:message:todayCustomer')")

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/controller/admin/permission/vo/CrmPermissionRespVO.java

@@ -13,7 +13,7 @@ public class CrmPermissionRespVO extends CrmPermissionBaseVO {
     @Schema(description = "数据权限编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "13563")
     private Long id;
 
-    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁人")
     private String nickname;
 
     @Schema(description = "部门名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "研发部")

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/controller/admin/receivable/CrmReceivableController.java

@@ -107,7 +107,7 @@ public class CrmReceivableController {
         return success(buildReceivableDetailPage(pageResult));
     }
 
-    // TODO 芋艿：后面在优化导出
+    // TODO 非繁人：后面在优化导出
     @GetMapping("/export-excel")
     @Operation(summary = "导出回款 Excel")
     @PreAuthorize("@ss.hasPermission('crm:receivable:export')")

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/controller/admin/receivable/CrmReceivablePlanController.java

@@ -111,7 +111,7 @@ public class CrmReceivablePlanController {
         return success(convertDetailReceivablePlanPage(pageResult));
     }
 
-    // TODO 芋艿：后面在优化导出
+    // TODO 非繁人：后面在优化导出
     @GetMapping("/export-excel")
     @Operation(summary = "导出回款计划 Excel")
     @PreAuthorize("@ss.hasPermission('crm:receivable-plan:export')")

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/controller/admin/receivable/vo/plan/CrmReceivablePlanPageReqVO.java

@@ -17,7 +17,7 @@ public class CrmReceivablePlanPageReqVO extends PageParam {
     @Schema(description = "客户编号", example = "18026")
     private Long customerId;
 
-    // TODO @芋艿：这个搜的应该是合同编号 no
+    // TODO @非繁人：这个搜的应该是合同编号 no
     @Schema(description = "合同名称", example = "3473")
     private Long contractId;
 

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/controller/admin/receivable/vo/receivable/CrmReceivableRespVO.java

@@ -4,7 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.time.LocalDateTime;
 
-// TODO 芋艿：导出的 VO，可以考虑使用 @Excel 注解，实现导出功能
+// TODO 非繁人：导出的 VO，可以考虑使用 @Excel 注解，实现导出功能
 @Schema(description = "管理后台 - CRM 回款 Response VO")
 @Data
 @EqualsAndHashCode(callSuper = true)

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/dal/dataobject/clue/CrmClueDO.java

@@ -9,7 +9,7 @@ import lombok.*;
 
 import java.time.LocalDateTime;
 
-// TODO 芋艿：字段的顺序，需要整理下；
+// TODO 非繁人：字段的顺序，需要整理下；
 /**
  * 线索 DO
  *
@@ -80,8 +80,8 @@ public class CrmClueDO extends BaseDO {
      */
     private Long ownerUserId;
 
-    // TODO 芋艿：客户级别；
-    // TODO 芋艿：线索来源；
-    // TODO 芋艿：客户行业；
+    // TODO 非繁人：客户级别；
+    // TODO 非繁人：线索来源；
+    // TODO 非繁人：客户行业；
 
 }

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/dal/dataobject/contract/CrmContractDO.java

@@ -9,7 +9,7 @@ import lombok.*;
 
 import java.time.LocalDateTime;
 
-// TODO 芋艿：实体的梳理
+// TODO 非繁人：实体的梳理
 /**
  * CRM 合同 DO
  *

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/dal/dataobject/customer/CrmCustomerDO.java

@@ -9,7 +9,7 @@ import lombok.*;
 
 import java.time.LocalDateTime;
 
-// TODO 芋艿：调整下字段
+// TODO 非繁人：调整下字段
 
 /**
  * CRM 客户 DO

feifan-module-crm/feifan-module-crm-biz/src/main/java/cn/newfeifan/mall/module/crm/service/customer/CrmCustomerServiceImpl.java

@@ -283,7 +283,7 @@ public class CrmCustomerServiceImpl implements CrmCustomerService {
         customerMapper.updateBatch(updateCustomers);
         // 2.3 创建负责人数据权限
         permissionService.createPermissionBatch(createPermissions);
-        // TODO @芋艿：要不要处理关联的联系人？？？
+        // TODO @非繁人：要不要处理关联的联系人？？？
 
         // 3. 记录操作日志
         AdminUserRespDTO user = null;

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/db/DatabaseDocController.java

@@ -113,7 +113,7 @@ public class DatabaseDocController {
     /**
      * 创建数据源
      */
-    // TODO 芋艿：screw 暂时不支持 druid，尴尬
+    // TODO 非繁人：screw 暂时不支持 druid，尴尬
     private HikariDataSource buildDataSource() {
         // 获得 DataSource 数据源，目前只支持首个
         String primary = dynamicDataSourceProperties.getPrimary();

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryListReqVO.java

@@ -12,7 +12,7 @@ import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR
 @Data
 public class Demo02CategoryListReqVO {
 
-    @Schema(description = "名字", example = "芋艿")
+    @Schema(description = "名字", example = "非繁人")
     private String name;
 
     @Schema(description = "父级编号", example = "6080")

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/demo/demo02/vo/Demo02CategoryRespVO.java

@@ -16,7 +16,7 @@ public class Demo02CategoryRespVO {
     @ExcelProperty("编号")
     private Long id;
 
-    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁人")
     @ExcelProperty("名字")
     private String name;
 

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/demo/demo02/vo/Demo02CategorySaveReqVO.java

@@ -13,7 +13,7 @@ public class Demo02CategorySaveReqVO {
     @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "10304")
     private Long id;
 
-    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁人")
     @NotEmpty(message = "名字不能为空")
     private String name;
 

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/demo/demo03/vo/Demo03StudentPageReqVO.java

@@ -14,7 +14,7 @@ import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR
 @ToString(callSuper = true)
 public class Demo03StudentPageReqVO extends PageParam {
 
-    @Schema(description = "名字", example = "芋艿")
+    @Schema(description = "名字", example = "非繁人")
     private String name;
 
     @Schema(description = "性别")

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/demo/demo03/vo/Demo03StudentRespVO.java

@@ -17,7 +17,7 @@ public class Demo03StudentRespVO {
     @ExcelProperty("编号")
     private Long id;
 
-    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁人")
     @ExcelProperty("名字")
     private String name;
 

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/controller/admin/demo/demo03/vo/Demo03StudentSaveReqVO.java

@@ -15,7 +15,7 @@ public class Demo03StudentSaveReqVO {
     @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8525")
     private Long id;
 
-    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁人")
     @NotEmpty(message = "名字不能为空")
     private String name;
 

feifan-module-infra/feifan-module-infra-biz/src/main/java/cn/newfeifan/mall/module/infra/service/codegen/inner/CodegenBuilder.java

@@ -193,7 +193,7 @@ public class CodegenBuilder {
         }
         // name
         if (StrUtil.endWithIgnoreCase(column.getJavaField(), "name")) {
-            column.setExample(randomEle(new String[]{"张三", "李四", "王五", "赵六", "芋艿"}));
+            column.setExample(randomEle(new String[]{"张三", "李四", "王五", "赵六", "非繁人"}));
             return;
         }
         // status

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/app/spu/AppProductSpuController.java

@@ -148,5 +148,5 @@ public class AppProductSpuController {
         return price - newPrice;
     }
 
-    // TODO 芋艿：商品的浏览记录；
+    // TODO 非繁人：商品的浏览记录；
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/brand/ProductBrandDO.java

@@ -48,6 +48,6 @@ public class ProductBrandDO extends BaseDO {
      */
     private Integer status;
 
-    // TODO 芋艿：firstLetter 首字母
+    // TODO 非繁人：firstLetter 首字母
 
 }

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/dal/dataobject/sku/ProductSkuDO.java

@@ -42,6 +42,12 @@ public class ProductSkuDO extends BaseDO {
      */
     private Long shopId;
 
+    /**
+     * 商户ID，关联`sale_merchant`表
+     * add by Ben 20240316
+     */
+    private Long merchantId;
+
     /**
      * SPU 编号
      *
@@ -139,7 +145,7 @@ public class ProductSkuDO extends BaseDO {
 
     }
 
-    // TODO @芋艿：可以找一些新的思路
+    // TODO @非繁人：可以找一些新的思路
     public static class PropertyTypeHandler extends AbstractJsonTypeHandler<Object> {
 
         @Override
@@ -154,11 +160,11 @@ public class ProductSkuDO extends BaseDO {
 
     }
 
-    // TODO 芋艿：integral from y
-    // TODO 芋艿：pinkPrice from y
-    // TODO 芋艿：seckillPrice from y
-    // TODO 芋艿：pinkStock from y
-    // TODO 芋艿：seckillStock from y
+    // TODO 非繁人：integral from y
+    // TODO 非繁人：pinkPrice from y
+    // TODO 非繁人：seckillPrice from y
+    // TODO 非繁人：pinkStock from y
+    // TODO 非繁人：seckillStock from y
 
 }
 

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/service/spu/ProductSpuServiceImpl.java

@@ -168,7 +168,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
         if (ObjectUtil.notEqual(spuDO.getStatus(), ProductSpuStatusEnum.RECYCLE.getStatus())) {
             throw exception(SPU_NOT_RECYCLE);
         }
-        // TODO 芋艿：【可选】参与活动中的商品，不允许删除？？？
+        // TODO 非繁人：【可选】参与活动中的商品，不允许删除？？？
 
         // 删除 SPU
         productSpuMapper.deleteById(id);
@@ -236,7 +236,7 @@ public class ProductSpuServiceImpl implements ProductSpuService {
     public void updateSpuStatus(ProductSpuUpdateStatusReqVO updateReqVO) {
         // 校验存在
         validateSpuExists(updateReqVO.getId());
-        // TODO 芋艿：【可选】参与活动中的商品，不允许下架？？？
+        // TODO 非繁人：【可选】参与活动中的商品，不允许下架？？？
 
         // 更新状态
         ProductSpuDO productSpuDO = productSpuMapper.selectById(updateReqVO.getId()).setStatus(updateReqVO.getStatus());

feifan-module-mall/feifan-module-promotion-api/src/main/java/cn/newfeifan/mall/module/promotion/api/reward/dto/RewardActivityMatchRespDTO.java

@@ -37,7 +37,7 @@ public class RewardActivityMatchRespDTO {
      */
     private List<Long> spuIds;
 
-    // TODO 芋艿：后面 RewardActivityRespDTO 有了之后，Rule 可以放过去
+    // TODO 非繁人：后面 RewardActivityRespDTO 有了之后，Rule 可以放过去
     /**
      * 优惠规则
      */

feifan-module-mall/feifan-module-promotion-api/src/main/java/cn/newfeifan/mall/module/promotion/enums/common/PromotionActivityStatusEnum.java

@@ -6,7 +6,7 @@ import lombok.Getter;
 
 import java.util.Arrays;
 
-// TODO 芋艿：弱化这个状态
+// TODO 非繁人：弱化这个状态
 /**
  * 促销活动的状态枚举
  *

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/bargain/vo/help/BargainHelpRespVO.java

@@ -18,7 +18,7 @@ public class BargainHelpRespVO extends BargainHelpBaseVO {
 
     // ========== 用户相关 ==========
 
-    @Schema(description = "用户昵称", example = "老芋艿")
+    @Schema(description = "用户昵称", example = "老非繁人")
     private String nickname;
 
     @Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.zhongxing.cn/xxx.jpg")

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/bargain/vo/recrod/BargainRecordPageItemRespVO.java

@@ -25,7 +25,7 @@ public class BargainRecordPageItemRespVO extends BargainRecordBaseVO {
 
     // ========== 用户相关 ==========
 
-    @Schema(description = "用户昵称", example = "老芋艿")
+    @Schema(description = "用户昵称", example = "老非繁人")
     private String nickname;
 
     @Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.zhongxing.cn/xxx.jpg")

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/combination/vo/recrod/CombinationRecordBaseVO.java

@@ -33,7 +33,7 @@ public class CombinationRecordBaseVO {
     @NotNull(message = "用户编号不能为空")
     private Long userId;
 
-    @Schema(description = "用户昵称", example = "老芋艿")
+    @Schema(description = "用户昵称", example = "老非繁人")
     private String nickname;
 
     @Schema(description = "用户头像", requiredMode = Schema.RequiredMode.REQUIRED, example = "https://www.zhongxing.cn/xxx.jpg")

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/coupon/vo/coupon/CouponPageItemRespVO.java

@@ -11,7 +11,7 @@ import lombok.ToString;
 @ToString(callSuper = true)
 public class CouponPageItemRespVO extends CouponRespVO {
 
-    @Schema(description = "用户昵称", example = "老芋艿")
+    @Schema(description = "用户昵称", example = "老非繁人")
     private String nickname;
 
 }

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/controller/admin/coupon/vo/coupon/CouponPageReqVO.java

@@ -31,7 +31,7 @@ public class CouponPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
-    @Schema(description = "用户昵称", example = "芋艿")
+    @Schema(description = "用户昵称", example = "非繁人")
     private String nickname;
 
     @Schema(description = "用户编号", example = "1")

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/dal/dataobject/combination/CombinationRecordDO.java

@@ -9,7 +9,7 @@ import lombok.*;
 
 import java.time.LocalDateTime;
 
-// TODO 芋艿：把字段的顺序，和 do 顺序对齐下
+// TODO 非繁人：把字段的顺序，和 do 顺序对齐下
 /**
  * 拼团记录 DO
  *

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/dal/dataobject/reward/RewardActivityDO.java

@@ -115,7 +115,7 @@ public class RewardActivityDO extends BaseDO {
 
     }
 
-    // TODO @芋艿：可以找一些新的思路
+    // TODO @非繁人：可以找一些新的思路
     public static class RuleTypeHandler extends AbstractJsonTypeHandler<List<Rule>> {
 
         @Override

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java

@@ -72,7 +72,7 @@ public interface SeckillActivityMapper extends BaseMapperX<SeckillActivityDO> {
     default PageResult<SeckillActivityDO> selectPage(AppSeckillActivityPageReqVO pageReqVO, Integer status) {
         return selectPage(pageReqVO, new LambdaQueryWrapperX<SeckillActivityDO>()
                 .eqIfPresent(SeckillActivityDO::getStatus, status)
-                // TODO 芋艿：对 find in set 的想法；
+                // TODO 非繁人：对 find in set 的想法；
                 .apply(ObjectUtil.isNotNull(pageReqVO.getConfigId()), "FIND_IN_SET(" + pageReqVO.getConfigId() + ",config_ids) > 0"));
     }
 

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/job/coupon/CouponExpireJob.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
-// TODO 芋艿：配置一个 Job
+// TODO 非繁人：配置一个 Job
 /**
  * 优惠券过期 Job
  *

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/service/bargain/BargainHelpServiceImpl.java

@@ -93,7 +93,7 @@ public class BargainHelpServiceImpl implements BargainHelpService {
         return help;
     }
 
-    // TODO 芋艿：优化点：实现一个更随机的逻辑，可以按照你自己的业务；
+    // TODO 非繁人：优化点：实现一个更随机的逻辑，可以按照你自己的业务；
     private Integer calculateReducePrice(BargainActivityDO activity, BargainRecordDO record) {
         // 1. 随机金额
         Integer reducePrice = MathUtil.randomInt(activity.getBargainMinPrice(),

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/service/combination/CombinationRecordServiceImpl.java

@@ -41,7 +41,7 @@ import static cn.newfeifan.mall.framework.common.util.date.LocalDateTimeUtils.af
 import static cn.newfeifan.mall.framework.common.util.date.LocalDateTimeUtils.beforeNow;
 import static cn.newfeifan.mall.module.promotion.enums.ErrorCodeConstants.*;
 
-// TODO 芋艿：等拼团记录做完，完整 review 下
+// TODO 非繁人：等拼团记录做完，完整 review 下
 
 /**
  * 拼团记录 Service 实现类
@@ -69,7 +69,7 @@ public class CombinationRecordServiceImpl implements CombinationRecordService {
     @Lazy
     private TradeOrderApi tradeOrderApi;
 
-    // TODO @芋艿：在详细预览下；
+    // TODO @非繁人：在详细预览下；
     @Override
     public KeyValue<CombinationActivityDO, CombinationProductDO> validateCombinationRecord(
             Long userId, Long activityId, Long headId, Long skuId, Integer count) {

feifan-module-mall/feifan-module-promotion-biz/src/main/java/cn/newfeifan/mall/module/promotion/service/reward/RewardActivityServiceImpl.java

@@ -102,7 +102,7 @@ public class RewardActivityServiceImpl implements RewardActivityService {
         return activity;
     }
 
-    // TODO @芋艿：逻辑有问题，需要优化；要分成全场、和指定来校验；
+    // TODO @非繁人：逻辑有问题，需要优化；要分成全场、和指定来校验；
 
     /**
      * 校验商品参加的活动是否冲突
@@ -151,7 +151,7 @@ public class RewardActivityServiceImpl implements RewardActivityService {
 
     @Override
     public List<RewardActivityMatchRespDTO> getMatchRewardActivityList(Collection<Long> spuIds) {
-        // TODO 芋艿：待实现；先指定，然后再全局的；
+        // TODO 非繁人：待实现；先指定，然后再全局的；
 //        // 如果有全局活动，则直接选择它
 //        List<RewardActivityDO> allActivities = rewardActivityMapper.selectListByProductScopeAndStatus(
 //                PromotionProductScopeEnum.ALL.getScope(), PromotionActivityStatusEnum.RUN.getStatus());

feifan-module-mall/feifan-module-sale-biz/src/main/java/cn/newfeifan/mall/module/sale/dal/dataobject/shop/ShopDO.java

@@ -26,6 +26,13 @@ public class ShopDO extends BaseDO {
      */
     @TableId
     private Long id;
+
+    //是否启用全局包邮
+    private Boolean deliveryExpressFreeEnabled;
+
+    //全场包邮的最小金额，单位：分
+    private Integer deliveryExpressFreePrice;
+
     /**
      * 店铺名称
      */

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/controller/admin/member/MemberStatisticsController.java

@@ -39,7 +39,7 @@ public class MemberStatisticsController {
     @Resource
     private ApiAccessLogStatisticsService apiAccessLogStatisticsService;
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     @GetMapping("/summary")
     @Operation(summary = "获得会员统计（实时统计）")
     @PreAuthorize("@ss.hasPermission('statistics:member:query')")
@@ -47,7 +47,7 @@ public class MemberStatisticsController {
         return success(memberStatisticsService.getMemberSummary());
     }
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     @GetMapping("/analyse")
     @Operation(summary = "获得会员分析数据")
     @PreAuthorize("@ss.hasPermission('statistics:member:query')")
@@ -76,7 +76,7 @@ public class MemberStatisticsController {
         return success(MemberStatisticsConvert.INSTANCE.convert(visitUserCount, orderUserCount, payUserCount, atv, comparisonData));
     }
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     @GetMapping("/area-statistics-list")
     @Operation(summary = "按照省份，获得会员统计列表")
     @PreAuthorize("@ss.hasPermission('statistics:member:query')")
@@ -84,7 +84,7 @@ public class MemberStatisticsController {
         return success(memberStatisticsService.getMemberAreaStatisticsList());
     }
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     @GetMapping("/sex-statistics-list")
     @Operation(summary = "按照性别，获得会员统计列表")
     @PreAuthorize("@ss.hasPermission('statistics:member:query')")
@@ -92,7 +92,7 @@ public class MemberStatisticsController {
         return success(memberStatisticsService.getMemberSexStatisticsList());
     }
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     @GetMapping("/terminal-statistics-list")
     @Operation(summary = "按照终端，获得会员统计列表")
     @PreAuthorize("@ss.hasPermission('statistics:member:query')")
@@ -100,7 +100,7 @@ public class MemberStatisticsController {
         return success(memberStatisticsService.getMemberTerminalStatisticsList());
     }
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     // TODO @疯狂：要注意 date 的排序；
     @GetMapping("/user-count-comparison")
     @Operation(summary = "获得用户数量对照")
@@ -109,7 +109,7 @@ public class MemberStatisticsController {
         return success(memberStatisticsService.getUserCountComparison());
     }
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     @GetMapping("/register-count-list")
     @Operation(summary = "获得会员注册数量列表")
     @PreAuthorize("@ss.hasPermission('statistics:member:query')")

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/controller/app/package-info.java

@@ -1,4 +1,4 @@
 /**
- * TODO 芋艿：占位
+ * TODO 非繁人：占位
  */
 package cn.newfeifan.mall.module.statistics.controller.app;

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/dal/mysql/infra/ApiAccessLogStatisticsMapper.java

@@ -6,7 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
 
-// TODO @芋艿：api 访问日志，现在会清理，可能要单独有个偏业务的访问表；
+// TODO @非繁人：api 访问日志，现在会清理，可能要单独有个偏业务的访问表；
 /**
  * API 访问日志的统计 Mapper
  *
@@ -16,12 +16,12 @@ import java.time.LocalDateTime;
 @SuppressWarnings("rawtypes")
 public interface ApiAccessLogStatisticsMapper extends BaseMapperX {
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     Integer selectIpCountByUserTypeAndCreateTimeBetween(@Param("userType") Integer userType,
                                                         @Param("beginTime") LocalDateTime beginTime,
                                                         @Param("endTime") LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     Integer selectUserCountByUserTypeAndCreateTimeBetween(@Param("userType") Integer userType,
                                                           @Param("beginTime") LocalDateTime beginTime,
                                                           @Param("endTime") LocalDateTime endTime);

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/dal/mysql/member/MemberStatisticsMapper.java

@@ -20,20 +20,20 @@ import java.util.List;
 @SuppressWarnings("rawtypes")
 public interface MemberStatisticsMapper extends BaseMapperX {
 
-    // TODO @芋艿：已经 review
+    // TODO @非繁人：已经 review
     List<MemberAreaStatisticsRespBO> selectSummaryListByAreaId();
 
-    // TODO @芋艿：已经 review
+    // TODO @非繁人：已经 review
     List<MemberSexStatisticsRespVO> selectSummaryListBySex();
 
-    // TODO @芋艿：已经 review
+    // TODO @非繁人：已经 review
     List<MemberTerminalStatisticsRespVO> selectSummaryListByRegisterTerminal();
 
-    // TODO @芋艿：已经 review
+    // TODO @非繁人：已经 review
     Integer selectUserCount(@Param("beginTime") LocalDateTime beginTime,
                             @Param("endTime") LocalDateTime endTime);
 
-    // TODO @芋艿：已经 review
+    // TODO @非繁人：已经 review
     /**
      * 获得用户的每天注册数量列表
      *

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/dal/mysql/pay/PayWalletStatisticsMapper.java

@@ -17,27 +17,27 @@ import java.time.LocalDateTime;
 @SuppressWarnings("rawtypes")
 public interface PayWalletStatisticsMapper extends BaseMapperX {
 
-    // TODO 芋艿：已经 review；
+    // TODO 非繁人：已经 review；
     WalletSummaryRespBO selectRechargeSummaryByPayTimeBetween(@Param("beginTime") LocalDateTime beginTime,
                                                               @Param("endTime") LocalDateTime endTime,
                                                               @Param("payStatus") Boolean payStatus);
 
-    // TODO 芋艿：已经 review；
+    // TODO 非繁人：已经 review；
     WalletSummaryRespBO selectRechargeSummaryByRefundTimeBetween(@Param("beginTime") LocalDateTime beginTime,
                                                                  @Param("endTime") LocalDateTime endTime,
                                                                  @Param("refundStatus") Integer refundStatus);
 
-    // TODO 芋艿：已经 review；
+    // TODO 非繁人：已经 review；
     Integer selectPriceSummaryByBizTypeAndCreateTimeBetween(@Param("beginTime") LocalDateTime beginTime,
                                                             @Param("endTime") LocalDateTime endTime,
                                                             @Param("bizType") Integer bizType);
 
-    // TODO 芋艿：已经 review；
+    // TODO 非繁人：已经 review；
     RechargeSummaryRespBO selectRechargeSummaryGroupByWalletId(@Param("beginTime") LocalDateTime beginTime,
                                                                @Param("endTime") LocalDateTime endTime,
                                                                @Param("payStatus") Boolean payStatus);
 
-    // TODO 芋艿：已经 review；
+    // TODO 非繁人：已经 review；
     Integer selectRechargePriceSummary(@Param("payStatus") Integer payStatus);
 
 }

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/dal/mysql/trade/AfterSaleStatisticsMapper.java

@@ -16,11 +16,11 @@ import java.time.LocalDateTime;
 @Mapper
 public interface AfterSaleStatisticsMapper extends BaseMapperX<TradeStatisticsDO> {
 
-    // TODO 芋艿：已 review
+    // TODO 非繁人：已 review
     AfterSaleSummaryRespBO selectSummaryByRefundTimeBetween(@Param("beginTime") LocalDateTime beginTime,
                                                             @Param("endTime") LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     Long selectCountByStatus(@Param("status") Integer status);
 
 }

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/dal/mysql/trade/BrokerageStatisticsMapper.java

@@ -15,13 +15,13 @@ import java.time.LocalDateTime;
 @Mapper
 public interface BrokerageStatisticsMapper extends BaseMapperX<TradeStatisticsDO> {
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     Integer selectSummaryPriceByStatusAndUnfreezeTimeBetween(@Param("bizType") Integer bizType,
                                                              @Param("status") Integer status,
                                                              @Param("beginTime") LocalDateTime beginTime,
                                                              @Param("endTime") LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     Long selectWithdrawCountByStatus(@Param("status") Integer status);
 
 }

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/dal/mysql/trade/TradeOrderStatisticsMapper.java

@@ -19,30 +19,30 @@ import java.util.List;
 @Mapper
 public interface TradeOrderStatisticsMapper extends BaseMapperX<TradeStatisticsDO> {
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     List<MemberAreaStatisticsRespBO> selectSummaryListByAreaId();
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     Integer selectCountByCreateTimeBetween(@Param("beginTime") LocalDateTime beginTime,
                                            @Param("endTime") LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     Integer selectCountByPayTimeBetween(@Param("beginTime") LocalDateTime beginTime,
                                         @Param("endTime") LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     Integer selectSummaryPriceByPayTimeBetween(@Param("beginTime") LocalDateTime beginTime,
                                                @Param("endTime") LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     Integer selectUserCountByCreateTimeBetween(@Param("beginTime") LocalDateTime beginTime,
                                                @Param("endTime") LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     Integer selectUserCountByPayTimeBetween(@Param("beginTime") LocalDateTime beginTime,
                                             @Param("endTime") LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 按照支付时间统计订单（按天分组）
      *
@@ -53,7 +53,7 @@ public interface TradeOrderStatisticsMapper extends BaseMapperX<TradeStatisticsD
     List<TradeOrderTrendRespVO> selectListByPayTimeBetweenAndGroupByDay(@Param("beginTime") LocalDateTime beginTime,
                                                                         @Param("endTime") LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 按照支付时间统计订单（按月分组）
      *
@@ -64,10 +64,10 @@ public interface TradeOrderStatisticsMapper extends BaseMapperX<TradeStatisticsD
     List<TradeOrderTrendRespVO> selectListByPayTimeBetweenAndGroupByMonth(@Param("beginTime") LocalDateTime beginTime,
                                                                           @Param("endTime") LocalDateTime endTime);
 
-    // TODO @芋艿：已经 review
+    // TODO @非繁人：已经 review
     Long selectCountByStatusAndDeliveryType(@Param("status") Integer status, @Param("deliveryType") Integer deliveryType);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     TradeOrderSummaryRespVO selectPaySummaryByStatusAndPayTimeBetween(@Param("status") Integer status,
                                                                       @Param("beginTime") LocalDateTime beginTime,
                                                                       @Param("endTime") LocalDateTime endTime);

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/dal/mysql/trade/TradeStatisticsMapper.java

@@ -25,17 +25,17 @@ public interface TradeStatisticsMapper extends BaseMapperX<TradeStatisticsDO> {
     TradeTrendSummaryRespVO selectVoByTimeBetween(@Param("beginTime") LocalDateTime beginTime,
                                                   @Param("endTime") LocalDateTime endTime);
 
-    // TODO @芋艿：已经 review
+    // TODO @非繁人：已经 review
     default List<TradeStatisticsDO> selectListByTimeBetween(LocalDateTime beginTime, LocalDateTime endTime) {
         return selectList(new LambdaQueryWrapperX<TradeStatisticsDO>()
                 .between(TradeStatisticsDO::getTime, beginTime, endTime));
     }
 
-    // TODO @芋艿：已经 review
+    // TODO @非繁人：已经 review
     Integer selectExpensePriceByTimeBetween(@Param("beginTime") LocalDateTime beginTime,
                                             @Param("endTime") LocalDateTime endTime);
 
-    // TODO @芋艿：已经 review
+    // TODO @非繁人：已经 review
     default TradeStatisticsDO selectByTimeBetween(LocalDateTime beginTime, LocalDateTime endTime) {
         return selectOne(new LambdaQueryWrapperX<TradeStatisticsDO>()
                 .between(TradeStatisticsDO::getTime, beginTime, endTime));

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/job/package-info.java

@@ -1,4 +1,4 @@
 /**
- * TODO 芋艿，占坑，无特殊含义
+ * TODO 非繁人，占坑，无特殊含义
  */
 package cn.newfeifan.mall.module.statistics.job;

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/job/product/ProductStatisticsJob.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
-// TODO 芋艿：缺个 Job 的配置；等和 Product 一起配置
+// TODO 非繁人：缺个 Job 的配置；等和 Product 一起配置
 
 /**
  * 商品统计 Job

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/job/trade/TradeStatisticsJob.java

@@ -11,7 +11,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
-// TODO 芋艿：缺个 Job 的配置；等和 Product 一起配置
+// TODO 非繁人：缺个 Job 的配置；等和 Product 一起配置
 /**
  * 交易统计 Job
  *

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/service/infra/ApiAccessLogStatisticsService.java

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
  */
 public interface ApiAccessLogStatisticsService {
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取活跃用户数量
      *
@@ -20,7 +20,7 @@ public interface ApiAccessLogStatisticsService {
      */
     Integer getUserCount(Integer userType, LocalDateTime beginTime, LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取访问用户数量
      *

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/service/member/MemberStatisticsService.java

@@ -13,7 +13,7 @@ import java.util.List;
  */
 public interface MemberStatisticsService {
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取会员统计（实时统计）
      *
@@ -21,7 +21,7 @@ public interface MemberStatisticsService {
      */
     MemberSummaryRespVO getMemberSummary();
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取会员分析对照数据
      *
@@ -32,7 +32,7 @@ public interface MemberStatisticsService {
     DataComparisonRespVO<MemberAnalyseDataRespVO> getMemberAnalyseComparisonData(LocalDateTime beginTime,
                                                                                  LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 按照省份，获得会员统计列表
      *
@@ -40,7 +40,7 @@ public interface MemberStatisticsService {
      */
     List<MemberAreaStatisticsRespVO> getMemberAreaStatisticsList();
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 按照性别，获得会员统计列表
      *
@@ -55,7 +55,7 @@ public interface MemberStatisticsService {
      */
     List<MemberTerminalStatisticsRespVO> getMemberTerminalStatisticsList();
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取用户注册数量列表
      *
@@ -65,7 +65,7 @@ public interface MemberStatisticsService {
      */
     List<MemberRegisterCountRespVO> getMemberRegisterCountList(LocalDateTime beginTime, LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获得用户数量量统计对照
      *

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/service/pay/PayWalletStatisticsService.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
  */
 public interface PayWalletStatisticsService {
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取钱包统计
      *
@@ -22,7 +22,7 @@ public interface PayWalletStatisticsService {
      */
     WalletSummaryRespBO getWalletSummary(LocalDateTime beginTime, LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取钱包充值统计
      *
@@ -32,7 +32,7 @@ public interface PayWalletStatisticsService {
      */
     RechargeSummaryRespBO getUserRechargeSummary(LocalDateTime beginTime, LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取充值金额合计
      *

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/service/trade/AfterSaleStatisticsService.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
  */
 public interface AfterSaleStatisticsService {
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取售后单统计
      *
@@ -22,7 +22,7 @@ public interface AfterSaleStatisticsService {
      */
     AfterSaleSummaryRespBO getAfterSaleSummary(LocalDateTime beginTime, LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取指定状态的售后订单数量
      *

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/service/trade/BrokerageStatisticsService.java

@@ -11,7 +11,7 @@ import java.time.LocalDateTime;
  */
 public interface BrokerageStatisticsService {
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取已结算的佣金金额
      *
@@ -21,7 +21,7 @@ public interface BrokerageStatisticsService {
      */
     Integer getBrokerageSettlementPriceSummary(LocalDateTime beginTime, LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取指定状态的提现记录数量
      *

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/service/trade/TradeOrderStatisticsService.java

@@ -24,7 +24,7 @@ public interface TradeOrderStatisticsService {
      */
     TradeOrderSummaryRespBO getOrderSummary(LocalDateTime beginTime, LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取地区订单统计
      *
@@ -32,7 +32,7 @@ public interface TradeOrderStatisticsService {
      */
     List<MemberAreaStatisticsRespBO> getSummaryListByAreaId();
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取下单用户数量
      *
@@ -42,7 +42,7 @@ public interface TradeOrderStatisticsService {
      */
     Integer getOrderUserCount(LocalDateTime beginTime, LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取支付用户数量
      *
@@ -52,7 +52,7 @@ public interface TradeOrderStatisticsService {
      */
     Integer getPayUserCount(LocalDateTime beginTime, LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获取支付金额
      *
@@ -69,7 +69,7 @@ public interface TradeOrderStatisticsService {
      */
     Long getCountByStatusAndDeliveryType(Integer status, Integer deliveryType);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 交易订单销售额对照
      *
@@ -77,7 +77,7 @@ public interface TradeOrderStatisticsService {
      */
     DataComparisonRespVO<TradeOrderSummaryRespVO> getOrderComparison();
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 获得订单量趋势统计
      *

feifan-module-mall/feifan-module-statistics-biz/src/main/java/cn/newfeifan/mall/module/statistics/service/trade/TradeStatisticsService.java

@@ -41,7 +41,7 @@ public interface TradeStatisticsService {
      */
     List<TradeStatisticsDO> getTradeStatisticsList(LocalDateTime beginTime, LocalDateTime endTime);
 
-    // TODO 芋艿：已经 review；
+    // TODO 非繁人：已经 review；
     /**
      * 统计指定天数的交易数据
      *
@@ -49,7 +49,7 @@ public interface TradeStatisticsService {
      */
     String statisticsTrade(Integer days);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 统计指定日期的交易数据
      *
@@ -58,7 +58,7 @@ public interface TradeStatisticsService {
      */
     TradeSummaryRespBO getTradeSummaryByDays(int days);
 
-    // TODO 芋艿：已经 review
+    // TODO 非繁人：已经 review
     /**
      * 统计指定月份的交易数据
      *

feifan-module-mall/feifan-module-trade-api/src/main/java/cn/newfeifan/mall/module/trade/api/order/TradeOrderApi.java

@@ -28,7 +28,7 @@ public interface TradeOrderApi {
      */
     TradeOrderRespDTO getOrder(Long id);
 
-    // TODO 芋艿：需要优化下；
+    // TODO 非繁人：需要优化下；
     /**
      * 取消支付订单
      *

feifan-module-mall/feifan-module-trade-api/src/main/java/cn/newfeifan/mall/module/trade/enums/MessageTemplateConstants.java

@@ -1,6 +1,6 @@
 package cn.newfeifan.mall.module.trade.enums;
 
-// TODO @芋艿：枚举
+// TODO @非繁人：枚举
 /**
  * 通知模板枚举类
  *

feifan-module-mall/feifan-module-trade-api/src/main/java/cn/newfeifan/mall/module/trade/enums/brokerage/BrokerageWithdrawStatusEnum.java

@@ -6,7 +6,7 @@ import lombok.Getter;
 
 import java.util.Arrays;
 
-// TODO 芋艿：提现的打通，在纠结下；
+// TODO 非繁人：提现的打通，在纠结下；
 /**
  * 佣金提现状态枚举
  *

feifan-module-mall/feifan-module-trade-api/src/main/java/cn/newfeifan/mall/module/trade/enums/notify/TradeNotifyEnums.java

@@ -1,5 +1,5 @@
 package cn.newfeifan.mall.module.trade.enums.notify;
 
-// TODO @芋艿：这个枚举的作用？
+// TODO @非繁人：这个枚举的作用？
 public interface TradeNotifyEnums {
 }

feifan-module-mall/feifan-module-trade-biz/pom.xml

@@ -74,7 +74,7 @@
             <artifactId>feifan-spring-boot-starter-security</artifactId>
         </dependency>
 
-        <!-- TODO 芋艿：引入依赖要优化下： -->
+        <!-- TODO 非繁人：引入依赖要优化下： -->
         <dependency>
             <groupId>cn.newfeifan.zx</groupId>
             <artifactId>feifan-spring-boot-starter-biz-pay</artifactId>
@@ -118,6 +118,18 @@
             <version>2.0.0-jdk8-snapshot</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>cn.newfeifan.zx</groupId>
+            <artifactId>feifan-module-member-biz</artifactId>
+            <version>2.0.0-jdk8-snapshot</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.newfeifan.zx</groupId>
+            <artifactId>feifan-module-member-biz</artifactId>
+            <version>2.0.0-jdk8-snapshot</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawRespVO.java

@@ -19,7 +19,7 @@ public class BrokerageWithdrawRespVO extends BrokerageWithdrawBaseVO {
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
-    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @Schema(description = "用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "非繁人")
     private String userNickname;
 
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/TradeOrderItemBaseVO.java

@@ -57,7 +57,7 @@ public class TradeOrderItemBaseVO {
 
     // ========== 营销基本信息 ==========
 
-    // TODO 芋艿：在捉摸一下
+    // TODO 非繁人：在捉摸一下
 
     // ========== 售后基本信息 ==========
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/cart/vo/AppCartDetailRespVO.java

@@ -53,7 +53,7 @@ public class AppCartDetailRespVO {
 
         // ========== 价格相关的字段，对应 PriceCalculateRespDTO.OrderItem 的属性 ==========
 
-        // TODO 芋艿：后续可以去除一些无用的字段
+        // TODO 非繁人：后续可以去除一些无用的字段
 
         @Schema(description = "商品原价（单）", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
         private Integer originalPrice;
@@ -80,7 +80,7 @@ public class AppCartDetailRespVO {
     @Data
     public static class Order {
 
-        // TODO 芋艿：后续可以去除一些无用的字段
+        // TODO 非繁人：后续可以去除一些无用的字段
 
         @Schema(description = "商品原价（总）", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
         private Integer skuOriginalPrice;

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/delivery/AppDeliverConfigController.java

@@ -17,7 +17,7 @@ import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
 @Validated
 public class AppDeliverConfigController {
 
-    // TODO @芋艿：这里后面干掉，合并到 AppTradeConfigController 中
+    // TODO @非繁人：这里后面干掉，合并到 AppTradeConfigController 中
     @GetMapping("/get")
     @Operation(summary = "获得配送配置")
     public CommonResult<AppDeliveryConfigRespVO> getDeliveryConfig() {

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/delivery/vo/config/AppDeliveryConfigRespVO.java

@@ -3,7 +3,7 @@ package cn.newfeifan.mall.module.trade.controller.app.delivery.vo.config;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-// TODO 芋艿：后续要实现下，配送配置；后续融合到 AppTradeConfigRespVO 中
+// TODO 非繁人：后续要实现下，配送配置；后续融合到 AppTradeConfigRespVO 中
 @Schema(description = "用户 App - 配送配置 Response VO")
 @Data
 public class AppDeliveryConfigRespVO {

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderCreateReqVO.java

@@ -5,12 +5,21 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import javax.validation.constraints.AssertTrue;
+import java.util.Map;
 
 @Schema(description = "用户 App - 交易订单创建 Request VO")
 @Data
 public class AppTradeOrderCreateReqVO extends AppTradeOrderSettlementReqVO {
 
-    @Schema(description = "备注", example = "这个是我的订单哟")
+    //add by Ben
+    @Schema(description = "为键值对，键为店铺ID，值为备注文本", example = "{1:'包装好点，送人的！',2:''}")
+    private Map<Long,String> shopRemarks;
+
+    //add by Ben
+    @Schema(description = "本订单使用积分，为一整数", example = "36")
+    private Integer payPoints;
+
+    @Schema(description = "【本属性已不作页面与后台传值使用，被shopRemarks替代。本属性只作java内部使用】备注", example = "这个是我的订单哟")
     private String remark;
 
     @AssertTrue(message = "配送方式不能为空")

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderSettlementReqVO.java

@@ -20,6 +20,9 @@ import java.util.List;
 @Valid
 public class AppTradeOrderSettlementReqVO {
 
+    @Schema(description = "店铺ID")
+    private Long shopId;
+
     @Schema(description = "商品项数组", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "商品不能为空")
     private List<Item> items;
@@ -41,7 +44,7 @@ public class AppTradeOrderSettlementReqVO {
 
     @Schema(description = "自提门店编号", example = "1088")
     private Long pickUpStoreId;
-    @Schema(description = "收件人名称", example = "芋艿") // 选择门店自提时，该字段为联系人名
+    @Schema(description = "收件人名称", example = "非繁人") // 选择门店自提时，该字段为联系人名
     private String receiverName;
     @Schema(description = "收件人手机", example = "15601691300") // 选择门店自提时，该字段为联系人手机
     @Mobile(message = "收件人手机格式不正确")

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java

@@ -14,11 +14,21 @@ import java.util.Map;
 @Data
 public class AppTradeOrderSettlementRespVO {
 
+
+    @Schema(description = "保存每个店铺返回页面的 订单信息汇总，key为店铺id，value为商品价格运费", requiredMode = Schema.RequiredMode.REQUIRED, example = "{1:{}},2:{}}}")
+    Map<Long,AppTradeOrderSettlementRespVO> shopRespVOMap;
+
+
     @Schema(description = "为键值对：根据店铺聚合的skuId列表，key为店铺id，value为商品skuid数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "{1:[12,23],2:[34,73]}") //key为店铺ID，value为skuid的List
     Map<Long,List<Long>> shopSkuIds;
     @Schema(description = "为键值对：商品对应的店铺id和店名，key为店铺id，value为店铺名", requiredMode = Schema.RequiredMode.REQUIRED, example = "{15:'中星直营店',23:'五行茶旗舰店'}") //key为店铺ID，value为skuid的List
     Map<Long,String> shopNameMap;
 
+    /**
+     * 当前积分值
+     */
+    private Long currentMemberPoints;
+
     @Schema(description = "交易类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") // 对应 TradeOrderTypeEnum 枚举
     private Integer type;
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/item/AppTradeOrderItemRespVO.java

@@ -48,7 +48,7 @@ public class AppTradeOrderItemRespVO {
 
     // ========== 营销基本信息 ==========
 
-    // TODO 芋艿：在捉摸一下
+    // TODO 非繁人：在捉摸一下
 
     // ========== 售后基本信息 ==========