修改编译错误

08.src/Xingxi/pom.xml

@@ -28,6 +28,7 @@
         <pagehelper.boot.version>1.4.7</pagehelper.boot.version>
         <fastjson.version>1.2.83</fastjson.version>
         <oshi.version>6.6.5</oshi.version>
+        <lombok.version>1.18.22</lombok.version>
         <commons.io.version>2.16.1</commons.io.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>
@@ -188,6 +189,14 @@
                 <version>${commons.io.version}</version>
             </dependency>
 
+            <!-- lombok -->
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+                <optional>true</optional>
+            </dependency>
+
             <!-- excel工具 -->
             <dependency>
                 <groupId>org.apache.poi</groupId>
@@ -205,42 +214,36 @@
                 <artifactId>velocity-engine-core</artifactId>
                 <version>${velocity.version}</version>
             </dependency>
-
             <!-- 阿里JSON解析器 -->
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>
                 <version>${fastjson.version}</version>
             </dependency>
-
             <!-- 定时任务-->
             <dependency>
                 <groupId>com.xingxi</groupId>
                 <artifactId>xingxi-quartz</artifactId>
                 <version>${xingxi.version}</version>
             </dependency>
-
             <!-- 代码生成-->
             <dependency>
                 <groupId>com.xingxi</groupId>
                 <artifactId>xingxi-generator</artifactId>
                 <version>${xingxi.version}</version>
             </dependency>
-
             <!-- 核心模块-->
             <dependency>
                 <groupId>com.xingxi</groupId>
                 <artifactId>xingxi-framework</artifactId>
                 <version>${xingxi.version}</version>
             </dependency>
-
             <!-- 系统模块-->
             <dependency>
                 <groupId>com.xingxi</groupId>
                 <artifactId>xingxi-system</artifactId>
                 <version>${xingxi.version}</version>
             </dependency>
-
             <!-- 通用工具-->
             <dependency>
                 <groupId>com.xingxi</groupId>
@@ -256,14 +259,14 @@
     </dependencyManagement>
 
     <modules>
-        <module>xingxi-admin</module>
+        <module>xingxi-common</module>
+        <module>xingxi-system</module>
+        <module>xingxi-framework</module>
         <module>xingxi-mq-server</module>
+        <module>xingxi-admin</module>
         <module>xingxi-miniprogram-api</module>
-        <module>xingxi-framework</module>
-        <module>xingxi-system</module>
         <module>xingxi-quartz</module>
         <module>xingxi-generator</module>
-        <module>xingxi-common</module>
     </modules>
 
     <profiles>
@@ -277,6 +280,15 @@
             </activation>
         </profile>
         <profile>
+            <id>test</id>
+            <properties>
+                <env>release</env>
+            </properties>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
             <id>release</id>
             <properties>
                 <env>release</env>
@@ -332,5 +344,4 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
-
 </project>

08.src/Xingxi/xingxi-admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -5,14 +5,15 @@ com\xingxi\web\controller\system\SysCaptchaController.class
 com\xingxi\web\controller\demo\controller\DemoIconController.class
 com\xingxi\web\controller\system\SysIndexController.class
 com\xingxi\web\controller\system\SysUserController.class
-com\xingxi\RuoYiApplication.class
 com\xingxi\web\controller\monitor\SysLogininforController.class
 com\xingxi\web\controller\system\SysLoginController.class
 com\xingxi\web\controller\system\SysProfileController.class
 com\xingxi\web\controller\system\SysRoleController.class
+com\xingxi\XingxiServletInitializer.class
 com\xingxi\web\controller\demo\controller\AreaModel.class
 com\xingxi\web\controller\demo\controller\DemoReportController.class
 com\xingxi\web\controller\demo\controller\DemoTableController.class
+com\xingxi\XingxiApplication.class
 com\xingxi\web\controller\demo\controller\UserTableModel.class
 com\xingxi\web\controller\demo\controller\UserFormModel.class
 com\xingxi\web\controller\system\SysMenuController.class
@@ -31,7 +32,6 @@ com\xingxi\web\controller\system\SysDeptController.class
 com\xingxi\web\controller\system\SysDictTypeController.class
 com\xingxi\web\controller\demo\controller\DemoDialogController.class
 com\xingxi\web\controller\system\SysRegisterController.class
-com\xingxi\RuoYiServletInitializer.class
 com\xingxi\web\controller\tool\SwaggerController.class
 com\xingxi\web\controller\monitor\CacheController.class
 com\xingxi\web\controller\tool\UserEntity.class

08.src/Xingxi/xingxi-common/pom.xml

@@ -16,7 +16,6 @@
     </description>
 
     <dependencies>
-
         <!-- Spring框架基本的核心工具 -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -109,5 +108,4 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
-
 </project>

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/aliyun/oss/EOSSBucket.java

@@ -1,6 +1,5 @@
 package com.xingxi.common.aliyun.oss;
 
-
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -10,8 +9,8 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum EOSSBucket {
-    DEFAULT("biandan-default", "公共用"),
-    MRERC("biandan-private", "隐私文件用");
+    DEFAULT("xingxi-default", "公共用"),
+    MRERC("xingxi-private", "隐私文件用");
 
     private final String value;
     private final String desc;

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/aliyun/oss/OssClientFactory.java

@@ -4,93 +4,13 @@ import lombok.extern.slf4j.Slf4j;
 
 /**
  * @ClassName OssClientFactory
- * @projectName hocy
+ * @projectName xingxi
  * @Deacription 双端检索单例模式--》适用于并发场景 </br> </>OSSClient单例化工厂 使用ossClient单例化后,不可以再进行shutdown操作
  * @Author FZ.Dong
  * @Date 2020/9/17 15:29
  * @Version 1.0
  **/
-
 @Slf4j
 //@Component
 public class OssClientFactory {
-
-    //volatile是Java提供的一种轻量级的同步机制,在并发编程中,也扮演着比较重要的角色.
-    //同synchronized相比(synchronized通常称为重量级锁),volatile更轻量级,相比使用
-    //synchronized所带来的庞大开销,倘若能恰当的合理的使用volatile,则wonderful
-//    private volatile static OSS client;
-//
-//    private volatile static OSSClientBuilder ossClientBuilder;
-//
-//    private static String endpoint;
-//
-//    private static String accessKeyId;
-//
-//    private static String accessKeySecret;
-//
-//    @Value("${aliyun.oss.bucketName}")
-//    private String bucketName;
-//
-//    @Value("${aliyun.oss.customDomain}")
-//    private String customDomain;
-//
-//    private OssClientFactory() {
-//    }
-//
-//    @Bean
-//    @Scope("prototype")
-//    public static OSS initOSSClient() {
-//        log.info("获取OSSClient");
-//        if (client == null) {
-//            log.info("OSSClient为空,创建中");
-//            synchronized (OssClientFactory.class) {
-//                if (client == null) {
-//                    log.info("进入同步实例化OSSClient");
-//                    client = initOSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
-//                }
-//            }
-//        }
-//        return client;
-//    }
-//
-//
-//    public static OSSClientBuilder initOSSClientBuilder() {
-//        log.info("获取OSSClientBuilder");
-//        if (ossClientBuilder == null) {
-//            log.info("OSSClientBuilder为空,创建中");
-//            synchronized (OssClientFactory.class) {
-//                if (ossClientBuilder == null) {
-//                    log.info("进入同步实例化OSSClientBuilder");
-//                    ossClientBuilder = new OSSClientBuilder();
-//                }
-//            }
-//        }
-//        return ossClientBuilder;
-//    }
-//
-//
-//    @Value("${aliyun.oss.endPoint}")
-//    public void setEndpoint(String endPoint) {
-//        OssClientFactory.endpoint = endPoint;
-//    }
-//
-//    @Value("${aliyun.oss.accessKeyID}")
-//    public void setAccessKeyId(String accessKeyID) {
-//        OssClientFactory.accessKeyId = accessKeyID;
-//    }
-//
-//    @Value("${aliyun.oss.accessKeySecret}")
-//    public void setAccessKeySecret(String accessKeySecret) {
-//        OssClientFactory.accessKeySecret = accessKeySecret;
-//    }
-//
-//    public String getBucketName() {
-//        return bucketName;
-//    }
-//
-//    public String getCustomDomain() {
-//        return customDomain;
-//    }
-
-
 }

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/annotation/Anonymous.java

@@ -8,12 +8,11 @@ import java.lang.annotation.Target;
 
 /**
  * 匿名访问不鉴权注解
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
-@Target({ ElementType.METHOD, ElementType.TYPE })
+@Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface Anonymous
-{
+public @interface Anonymous {
 }

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/annotation/DataScope.java

@@ -8,26 +8,25 @@ import java.lang.annotation.Target;
 
 /**
  * 数据权限过滤注解
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-public @interface DataScope
-{
+public @interface DataScope {
     /**
      * 部门表的别名
      */
-    public String deptAlias() default "";
+    String deptAlias() default "";
 
     /**
      * 用户表的别名
      */
-    public String userAlias() default "";
+    String userAlias() default "";
 
     /**
      * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@RequiresPermissions获取，多个权限用逗号分隔开来
      */
-    public String permission() default "";
+    String permission() default "";
 }

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/annotation/DataSource.java

@@ -6,21 +6,21 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+
 import com.xingxi.common.enums.DataSourceType;
 
 /**
  * 自定义多数据源切换注解
- *
+ * <p>
  * 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准
  *
- * @author ruoyi
+ * @author xingxi
  */
-@Target({ ElementType.METHOD, ElementType.TYPE })
+@Target({ElementType.METHOD, ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
-public @interface DataSource
-{
+public @interface DataSource {
     /**
      * 切换数据源名称
      */

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/annotation/Excel.java

@@ -5,192 +5,186 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import java.math.BigDecimal;
+
 import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.IndexedColors;
 import com.xingxi.common.utils.poi.ExcelHandlerAdapter;
 
 /**
  * 自定义导出Excel数据注解
- * 
+ *
  * @author ruoyi
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
-public @interface Excel
-{
+public @interface Excel {
     /**
      * 导出时在excel中排序
      */
-    public int sort() default Integer.MAX_VALUE;
+    int sort() default Integer.MAX_VALUE;
 
     /**
      * 导出到Excel中的名字.
      */
-    public String name() default "";
+    String name() default "";
 
     /**
      * 日期格式, 如: yyyy-MM-dd
      */
-    public String dateFormat() default "";
+    String dateFormat() default "";
 
     /**
      * 如果是字典类型，请设置字典的type值 (如: sys_user_sex)
      */
-    public String dictType() default "";
+    String dictType() default "";
 
     /**
      * 读取内容转表达式 (如: 0=男,1=女,2=未知)
      */
-    public String readConverterExp() default "";
+    String readConverterExp() default "";
 
     /**
      * 分隔符，读取字符串组内容
      */
-    public String separator() default ",";
+    String separator() default ",";
 
     /**
      * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
      */
-    public int scale() default -1;
+    int scale() default -1;
 
     /**
      * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
      */
-    public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
+    int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
 
     /**
      * 导出时在excel中每个列的高度
      */
-    public double height() default 14;
+    double height() default 14;
 
     /**
      * 导出时在excel中每个列的宽度
      */
-    public double width() default 16;
+    double width() default 16;
 
     /**
      * 文字后缀,如% 90 变成90%
      */
-    public String suffix() default "";
+    String suffix() default "";
 
     /**
      * 当值为空时,字段的默认值
      */
-    public String defaultValue() default "";
+    String defaultValue() default "";
 
     /**
      * 提示信息
      */
-    public String prompt() default "";
+    String prompt() default "";
 
     /**
-     * 是否允许内容换行 
+     * 是否允许内容换行
      */
-    public boolean wrapText() default false;
+    boolean wrapText() default false;
 
     /**
      * 设置只能选择不能输入的列内容.
      */
-    public String[] combo() default {};
+    String[] combo() default {};
 
     /**
      * 是否从字典读数据到combo,默认不读取,如读取需要设置dictType注解.
      */
-    public boolean comboReadDict() default false;
+    boolean comboReadDict() default false;
 
     /**
      * 是否需要纵向合并单元格,应对需求:含有list集合单元格)
      */
-    public boolean needMerge() default false;
+    boolean needMerge() default false;
 
     /**
      * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
      */
-    public boolean isExport() default true;
+    boolean isExport() default true;
 
     /**
      * 另一个类中的属性名称,支持多级获取,以小数点隔开
      */
-    public String targetAttr() default "";
+    String targetAttr() default "";
 
     /**
      * 是否自动统计数据,在最后追加一行统计数据总和
      */
-    public boolean isStatistics() default false;
+    boolean isStatistics() default false;
 
     /**
      * 导出类型（0数字 1字符串 2图片）
      */
-    public ColumnType cellType() default ColumnType.STRING;
+    ColumnType cellType() default ColumnType.STRING;
 
     /**
      * 导出列头背景颜色
      */
-    public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
+    IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
 
     /**
      * 导出列头字体颜色
      */
-    public IndexedColors headerColor() default IndexedColors.WHITE;
+    IndexedColors headerColor() default IndexedColors.WHITE;
 
     /**
      * 导出单元格背景颜色
      */
-    public IndexedColors backgroundColor() default IndexedColors.WHITE;
+    IndexedColors backgroundColor() default IndexedColors.WHITE;
 
     /**
      * 导出单元格字体颜色
      */
-    public IndexedColors color() default IndexedColors.BLACK;
+    IndexedColors color() default IndexedColors.BLACK;
 
     /**
      * 导出字段对齐方式
      */
-    public HorizontalAlignment align() default HorizontalAlignment.CENTER;
+    HorizontalAlignment align() default HorizontalAlignment.CENTER;
 
     /**
      * 自定义数据处理器
      */
-    public Class<?> handler() default ExcelHandlerAdapter.class;
+    Class<?> handler() default ExcelHandlerAdapter.class;
 
     /**
      * 自定义数据处理器参数
      */
-    public String[] args() default {};
+    String[] args() default {};
 
     /**
      * 字段类型（0：导出导入；1：仅导出；2：仅导入）
      */
     Type type() default Type.ALL;
 
-    public enum Type
-    {
+    enum Type {
         ALL(0), EXPORT(1), IMPORT(2);
         private final int value;
 
-        Type(int value)
-        {
+        Type(int value) {
             this.value = value;
         }
 
-        public int value()
-        {
+        public int value() {
             return this.value;
         }
     }
 
-    public enum ColumnType
-    {
+    enum ColumnType {
         NUMERIC(0), STRING(1), IMAGE(2), TEXT(3);
         private final int value;
 
-        ColumnType(int value)
-        {
+        ColumnType(int value) {
             this.value = value;
         }
 
-        public int value()
-        {
+        public int value() {
             return this.value;
         }
     }

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/core/domain/BaseEntity.java

@@ -4,115 +4,114 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
 /**
  * Entity基类
- * 
- * @author ruoyi
+ *
+ * @author xingxi
  */
-public class BaseEntity implements Serializable
-{
+public class BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /** 搜索值 */
+    /**
+     * 搜索值
+     */
     @JsonIgnore
     private String searchValue;
 
-    /** 创建者 */
-    private String createBy;
+    /**
+     * 创建者
+     */
+    private String createUser;
 
-    /** 创建时间 */
+    /**
+     * 创建时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createTime;
 
-    /** 更新者 */
-    private String updateBy;
+    /**
+     * 更新者
+     */
+    private String updateUser;
 
-    /** 更新时间 */
+    /**
+     * 更新时间
+     */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date updateTime;
 
-    /** 备注 */
+    /**
+     * 备注
+     */
     private String remark;
 
-    /** 请求参数 */
+    /**
+     * 请求参数
+     */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
 
-    public String getSearchValue()
-    {
+    public String getSearchValue() {
         return searchValue;
     }
 
-    public void setSearchValue(String searchValue)
-    {
+    public void setSearchValue(String searchValue) {
         this.searchValue = searchValue;
     }
 
-    public String getCreateBy()
-    {
-        return createBy;
+    public String getCreateUser() {
+        return createUser;
     }
 
-    public void setCreateBy(String createBy)
-    {
-        this.createBy = createBy;
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
     }
 
-    public Date getCreateTime()
-    {
+    public Date getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime)
-    {
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
-    public String getUpdateBy()
-    {
-        return updateBy;
+    public String getUpdateUser() {
+        return updateUser;
     }
 
-    public void setUpdateBy(String updateBy)
-    {
-        this.updateBy = updateBy;
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
     }
 
-    public Date getUpdateTime()
-    {
+    public Date getUpdateTime() {
         return updateTime;
     }
 
-    public void setUpdateTime(Date updateTime)
-    {
+    public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
 
-    public String getRemark()
-    {
+    public String getRemark() {
         return remark;
     }
 
-    public void setRemark(String remark)
-    {
+    public void setRemark(String remark) {
         this.remark = remark;
     }
 
-    public Map<String, Object> getParams()
-    {
-        if (params == null)
-        {
+    public Map<String, Object> getParams() {
+        if (params == null) {
             params = new HashMap<>();
         }
         return params;
     }
 
-    public void setParams(Map<String, Object> params)
-    {
+    public void setParams(Map<String, Object> params) {
         this.params = params;
     }
 }

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/core/domain/entity/SysDept.java

@@ -194,9 +194,9 @@ public class SysDept extends BaseEntity
             .append("email", getEmail())
             .append("status", getStatus())
             .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
+            .append("createUser", getCreateUser())
             .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+            .append("updateUser", getUpdateUser())
             .append("updateTime", getUpdateTime())
             .toString();
     }

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/core/domain/entity/SysDictData.java

@@ -166,9 +166,9 @@ public class SysDictData extends BaseEntity
             .append("listClass", getListClass())
             .append("isDefault", getIsDefault())
             .append("status", getStatus())
-            .append("createBy", getCreateBy())
+            .append("createUser", getCreateUser())
             .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+            .append("updateUser", getUpdateUser())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
             .toString();

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/core/domain/entity/SysDictType.java

@@ -84,9 +84,9 @@ public class SysDictType extends BaseEntity
             .append("dictName", getDictName())
             .append("dictType", getDictType())
             .append("status", getStatus())
-            .append("createBy", getCreateBy())
+            .append("createUser", getCreateUser())
             .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+            .append("updateUser", getUpdateUser())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
             .toString();

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/core/domain/entity/SysMenu.java

@@ -204,9 +204,9 @@ public class SysMenu extends BaseEntity
             .append("visible", getVisible())
             .append("perms", getPerms())
             .append("icon", getIcon())
-            .append("createBy", getCreateBy())
+            .append("createUser", getCreateUser())
             .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+            .append("updateUser", getUpdateUser())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
             .toString();

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/core/domain/entity/SysRole.java

@@ -201,9 +201,9 @@ public class SysRole extends BaseEntity
             .append("dataScope", getDataScope())
             .append("status", getStatus())
             .append("delFlag", getDelFlag())
-            .append("createBy", getCreateBy())
+            .append("createUser", getCreateUser())
             .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+            .append("updateUser", getUpdateUser())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
             .toString();

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/core/domain/entity/SysUser.java

@@ -373,9 +373,9 @@ public class SysUser extends BaseEntity
             .append("delFlag", getDelFlag())
             .append("loginIp", getLoginIp())
             .append("loginDate", getLoginDate())
-            .append("createBy", getCreateBy())
+            .append("createUser", getCreateUser())
             .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
+            .append("updateUser", getUpdateUser())
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
             .append("dept", getDept())

08.src/Xingxi/xingxi-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,20 +1,33 @@
+com\xingxi\common\aliyun\oss\AliyunOSSClient.class
+com\xingxi\common\mq\bo\wxmessage\WxSubscribeMessageBO.class
 com\xingxi\common\core\domain\entity\SysDictData.class
+com\xingxi\common\mq\constant\InvoiceMqKey.class
 com\xingxi\common\utils\ShiroUtils.class
 com\xingxi\common\utils\file\FileUploadUtils.class
 com\xingxi\common\exception\user\UserException.class
+com\xingxi\common\mq\publisher\order\OrderDeliveredMqPublisher.class
+com\xingxi\common\mq\publisher\order\OrderCanceledMqPublisher.class
+com\xingxi\common\mq\publisher\order\OrderCreatedMqPublisher.class
 com\xingxi\common\utils\bean\BeanUtils.class
+com\xingxi\common\aliyun\oss\DefaultAliyunOSSClient.class
 com\xingxi\common\json\JSONObject$2.class
 com\xingxi\common\utils\http\HttpUtils$TrustAnyTrustManager.class
 com\xingxi\common\exception\user\UserDeleteException.class
+com\xingxi\common\exception\BusinessException.class
 com\xingxi\common\utils\IpUtils.class
 com\xingxi\common\utils\html\HTMLFilter.class
 com\xingxi\common\utils\ExceptionUtil.class
 com\xingxi\common\core\domain\entity\SysDept.class
 com\xingxi\common\exception\file\FileNameLengthLimitExceededException.class
+com\xingxi\common\mq\publisher\wxmessage\WxSubscribeMessagePublisher.class
+com\xingxi\common\mq\bo\wxmessage\WxSubscribeMessageBO$MsgData.class
 com\xingxi\common\annotation\Excel$ColumnType.class
 com\xingxi\common\constant\PermissionConstants.class
+com\xingxi\common\mq\bo\order\OrderFinishedBO.class
 com\xingxi\common\utils\LogUtils.class
+com\xingxi\common\mq\core\AbstractRabbitPublisher$1.class
 com\xingxi\common\core\domain\AjaxResult.class
+com\xingxi\common\mq\publisher\order\OrderReturnedMqPublisher.class
 com\xingxi\common\utils\uuid\IdUtils.class
 com\xingxi\common\enums\DataSourceType.class
 com\xingxi\common\config\serializer\SensitiveJsonSerializer.class
@@ -25,7 +38,10 @@ com\xingxi\common\utils\Threads.class
 com\xingxi\common\utils\http\HttpUtils$TrustAnyHostnameVerifier.class
 com\xingxi\common\xss\Xss.class
 com\xingxi\common\json\JSON.class
+com\xingxi\common\mq\publisher\invoice\InvoiceApplyMqPublisher.class
+com\xingxi\common\aliyun\oss\DefaultAliyunOSSClient$1.class
 com\xingxi\common\utils\security\CipherUtils.class
+com\xingxi\common\utils\uuid\IdWorker.class
 com\xingxi\common\config\RuoYiConfig.class
 com\xingxi\common\annotation\Log.class
 com\xingxi\common\exception\user\BlackListException.class
@@ -41,14 +57,18 @@ com\xingxi\common\core\context\PermissionContextHolder.class
 com\xingxi\common\annotation\Excel$Type.class
 com\xingxi\common\constant\GenConstants.class
 com\xingxi\common\utils\CacheUtils.class
+com\xingxi\common\mq\publisher\order\OrderFinishedMqPublisher.class
 com\xingxi\common\constant\ShiroConstants.class
 com\xingxi\common\exception\file\InvalidExtensionException$InvalidMediaExtensionException.class
+com\xingxi\common\mq\bo\order\OrderReturnedBO.class
 com\xingxi\common\exception\file\InvalidExtensionException$InvalidVideoExtensionException.class
 com\xingxi\common\core\text\CharsetKit.class
 com\xingxi\common\annotation\Anonymous.class
 com\xingxi\common\utils\PageUtils.class
 com\xingxi\common\exception\file\FileException.class
 com\xingxi\common\annotation\DataSource.class
+com\xingxi\common\mq\bo\order\OrderDetailBO.class
+com\xingxi\common\aliyun\oss\OssClientFactory.class
 com\xingxi\common\exception\user\RoleBlockedException.class
 com\xingxi\common\core\domain\entity\SysDictType.class
 com\xingxi\common\annotation\DataScope.class
@@ -62,15 +82,19 @@ com\xingxi\common\core\controller\BaseController$1.class
 com\xingxi\common\core\domain\R.class
 com\xingxi\common\config\thread\ThreadPoolConfig$1.class
 com\xingxi\common\exception\file\InvalidExtensionException.class
+com\xingxi\common\mq\constant\OrderMqKey.class
 com\xingxi\common\utils\poi\ExcelUtil.class
 com\xingxi\common\utils\http\HttpUtils$1.class
 com\xingxi\common\utils\file\MimeTypeUtils.class
+com\xingxi\common\mq\core\AbstractRabbit.class
 com\xingxi\common\xss\XssValidator.class
 com\xingxi\common\utils\DateUtils.class
 com\xingxi\common\core\domain\entity\SysRole.class
 com\xingxi\common\core\page\TableSupport.class
+com\xingxi\common\mq\publisher\order\OrderUnPaidMqPublisher.class
 com\xingxi\common\exception\UtilException.class
 com\xingxi\common\utils\html\EscapeUtil.class
+com\xingxi\common\mq\core\AbstractRabbitPublisher.class
 com\xingxi\common\utils\spring\SpringUtils.class
 com\xingxi\common\xss\XssFilter.class
 com\xingxi\common\exception\user\UserPasswordRetryLimitExceedException.class
@@ -88,44 +112,55 @@ com\xingxi\common\enums\OperatorType.class
 com\xingxi\common\json\JSONObject$1.class
 com\xingxi\common\utils\file\FileUtils.class
 com\xingxi\common\config\ServerConfig.class
+com\xingxi\common\mq\publisher\order\OrderDeliveryCanceledMqPublisher.class
 com\xingxi\common\utils\uuid\UUID$Holder.class
 com\xingxi\common\utils\DesensitizedUtil.class
 com\xingxi\common\json\JSONObject$EndArrayCallback.class
 com\xingxi\common\exception\file\FileSizeLimitExceededException.class
 com\xingxi\common\utils\file\FileTypeUtils.class
 com\xingxi\common\exception\GlobalException.class
+com\xingxi\common\mq\constant\WxSubscribeMessageMqKey.class
 com\xingxi\common\enums\UserStatus.class
 com\xingxi\common\utils\sql\SqlUtil.class
 com\xingxi\common\core\domain\entity\SysMenu.class
 com\xingxi\common\utils\file\ImageUtils.class
+com\xingxi\common\mq\bo\order\OrderCanceledBO.class
 com\xingxi\common\constant\Constants.class
 com\xingxi\common\exception\job\TaskException.class
 com\xingxi\common\utils\Arith.class
+com\xingxi\common\aliyun\oss\EOSSBucket.class
 com\xingxi\common\annotation\Sensitive.class
+com\xingxi\common\aliyun\oss\AliyunOSSProfile.class
 com\xingxi\common\constant\UserConstants.class
 com\xingxi\common\utils\http\HttpUtils.class
 com\xingxi\common\core\page\PageDomain.class
 com\xingxi\common\core\domain\TreeEntity.class
 com\xingxi\common\core\domain\BaseEntity.class
 com\xingxi\common\exception\base\BaseException.class
+com\xingxi\common\mq\publisher\order\OrderPayedMqPublisher.class
 com\xingxi\common\config\datasource\DynamicDataSourceContextHolder.class
 com\xingxi\common\core\domain\CxSelect.class
 com\xingxi\common\core\domain\entity\SysUser.class
 com\xingxi\common\core\text\Convert.class
+com\xingxi\common\config\AliyunOSSConfig.class
 com\xingxi\common\utils\DictUtils.class
 com\xingxi\common\utils\reflect\ReflectUtils.class
 com\xingxi\common\core\domain\AjaxResult$Type.class
 com\xingxi\common\xss\XssHttpServletRequestWrapper.class
+com\xingxi\common\mq\core\AbstractRabbitConsumer.class
 com\xingxi\common\utils\security\PermissionUtils.class
+com\xingxi\common\mq\bo\order\OrderBO.class
 com\xingxi\common\enums\OnlineStatus.class
 com\xingxi\common\exception\job\TaskException$Code.class
 com\xingxi\common\config\thread\ThreadPoolConfig.class
 com\xingxi\common\constant\ScheduleConstants.class
 com\xingxi\common\exception\user\CaptchaException.class
 com\xingxi\common\exception\user\UserPasswordRetryLimitCountException.class
+com\xingxi\common\config\IdWorkCfg.class
 com\xingxi\common\json\JSONObject$3.class
 com\xingxi\common\exception\file\InvalidExtensionException$InvalidFlashExtensionException.class
 com\xingxi\common\utils\poi\ExcelHandlerAdapter.class
+com\xingxi\common\mq\bo\invoice\InvoiceBO.class
 com\xingxi\common\annotation\Excels.class
 com\xingxi\common\exception\ServiceException.class
 com\xingxi\common\utils\StringUtils.class

08.src/Xingxi/xingxi-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,111 +1,143 @@
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\constant\PermissionConstants.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\entity\SysUser.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\sql\SqlUtil.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\security\Md5Utils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\file\FileSizeLimitExceededException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\file\FileException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\constant\GenConstants.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\UtilException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\json\JSONObject.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\entity\SysDictData.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\constant\ShiroConstants.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\xss\XssFilter.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\page\TableSupport.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\MapDataUtil.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\AjaxResult.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\file\FileUploadUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserBlockedException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\security\CipherUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\DesensitizedUtil.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\Excel.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\config\RuoYiConfig.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\file\MimeTypeUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\uuid\IdUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\Ztree.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\job\TaskException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\config\ServerConfig.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\constant\Constants.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\CookieUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\config\serializer\SensitiveJsonSerializer.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\ExceptionUtil.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\text\Convert.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\CxSelect.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\Log.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\Threads.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\LogUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\Sensitive.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\config\datasource\DynamicDataSourceContextHolder.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\entity\SysMenu.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\bean\BeanValidators.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\file\ImageUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\TreeEntity.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\xss\XssValidator.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\poi\ExcelUtil.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\DictUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\IpUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\file\InvalidExtensionException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserNotExistsException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\CacheUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\GlobalException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\BlackListException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\OperatorType.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\BaseEntity.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\Excels.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\config\thread\ThreadPoolConfig.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\Anonymous.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\R.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\page\PageDomain.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\file\FileNameLengthLimitExceededException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\base\BaseException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\OnlineStatus.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\AddressUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\poi\ExcelHandlerAdapter.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\BusinessType.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\file\FileUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\UserStatus.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserDeleteException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\constant\UserConstants.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\PageUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\DateUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\constant\ScheduleConstants.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\xss\XssHttpServletRequestWrapper.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\context\PermissionContextHolder.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\reflect\ReflectUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\DataSourceType.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\uuid\UUID.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\text\CharsetKit.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\spring\SpringUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\DataSource.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\text\StrFormatter.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\DesensitizedType.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\bean\BeanUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\entity\SysDictType.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\CaptchaException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\controller\BaseController.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\uuid\Seq.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserPasswordNotMatchException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\entity\SysDept.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\html\HTMLFilter.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\json\JSON.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\RepeatSubmit.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\html\EscapeUtil.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\BusinessStatus.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\security\PermissionUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\xss\Xss.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\ServletUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\file\FileUploadException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\ServiceException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\Arith.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\http\HttpUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserPasswordRetryLimitExceedException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\DataScope.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\entity\SysRole.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\ShiroUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserPasswordRetryLimitCountException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\page\TableDataInfo.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\StringUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\DemoModeException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\MessageUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\RoleBlockedException.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\file\FileTypeUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\publisher\order\OrderCanceledMqPublisher.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\sql\SqlUtil.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\config\thread\ThreadPoolConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\constant\WxSubscribeMessageMqKey.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\ServletUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\StringUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\base\BaseException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\MapDataUtil.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\Anonymous.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\publisher\order\OrderReturnedMqPublisher.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\Log.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\DesensitizedType.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserDeleteException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\LogUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\file\FileUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\config\IdWorkCfg.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\entity\SysMenu.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\html\HTMLFilter.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\page\PageDomain.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\aliyun\oss\AliyunOSSProfile.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\constant\ScheduleConstants.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\RepeatSubmit.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\bean\BeanValidators.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\entity\SysDept.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\file\FileUploadException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\constant\Constants.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\core\AbstractRabbitPublisher.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\text\StrFormatter.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\json\JSONObject.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\publisher\order\OrderDeliveryCanceledMqPublisher.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserNotExistsException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\publisher\invoice\InvoiceApplyMqPublisher.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\DataSource.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\R.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\aliyun\oss\DefaultAliyunOSSClient.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\DemoModeException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\uuid\IdWorker.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\reflect\ReflectUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserPasswordRetryLimitCountException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\config\ServerConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\Arith.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\CookieUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\bo\wxmessage\WxSubscribeMessageBO.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\entity\SysDictType.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\page\TableSupport.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\poi\ExcelUtil.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\security\PermissionUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserPasswordRetryLimitExceedException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\context\PermissionContextHolder.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\job\TaskException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\aliyun\oss\EOSSBucket.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\constant\GenConstants.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\bo\order\OrderFinishedBO.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\security\Md5Utils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\DesensitizedUtil.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\BusinessStatus.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\config\serializer\SensitiveJsonSerializer.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\MessageUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\config\AliyunOSSConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\BaseEntity.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\UtilException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\ShiroUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\bo\order\OrderCanceledBO.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\RoleBlockedException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\bo\invoice\InvoiceBO.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\aliyun\oss\AliyunOSSClient.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\TreeEntity.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\GlobalException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\constant\InvoiceMqKey.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\Excels.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\PageUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\publisher\order\OrderFinishedMqPublisher.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\file\MimeTypeUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\constant\PermissionConstants.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\aliyun\oss\OssClientFactory.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\file\FileException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\DictUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\file\InvalidExtensionException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\xss\XssFilter.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\page\TableDataInfo.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\json\JSON.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\uuid\UUID.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\html\EscapeUtil.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\Threads.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\entity\SysDictData.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\config\datasource\DynamicDataSourceContextHolder.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\OnlineStatus.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\bo\order\OrderReturnedBO.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\xss\XssHttpServletRequestWrapper.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\DataScope.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\CaptchaException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\http\HttpUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\UserStatus.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\uuid\Seq.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\text\Convert.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\core\AbstractRabbitConsumer.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\AjaxResult.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\file\FileUploadUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\spring\SpringUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\core\AbstractRabbit.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\poi\ExcelHandlerAdapter.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserBlockedException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\Excel.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\config\RuoYiConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\ExceptionUtil.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\file\FileSizeLimitExceededException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\bo\order\OrderDetailBO.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\constant\ShiroConstants.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\bean\BeanUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\Ztree.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\constant\UserConstants.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\CxSelect.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\OperatorType.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\DateUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\BusinessException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\constant\OrderMqKey.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\entity\SysUser.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\controller\BaseController.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\security\CipherUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\domain\entity\SysRole.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\UserPasswordNotMatchException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\AddressUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\annotation\Sensitive.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\user\BlackListException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\file\FileNameLengthLimitExceededException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\IpUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\xss\Xss.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\publisher\order\OrderDeliveredMqPublisher.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\file\ImageUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\BusinessType.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\publisher\order\OrderCreatedMqPublisher.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\publisher\order\OrderUnPaidMqPublisher.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\xss\XssValidator.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\file\FileTypeUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\core\text\CharsetKit.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\exception\ServiceException.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\bo\order\OrderBO.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\publisher\order\OrderPayedMqPublisher.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\CacheUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\enums\DataSourceType.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\mq\publisher\wxmessage\WxSubscribeMessagePublisher.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-common\src\main\java\com\xingxi\common\utils\uuid\IdUtils.java

08.src/Xingxi/xingxi-framework/pom.xml

@@ -16,7 +16,6 @@
     </description>
 
     <dependencies>
-
         <!-- SpringBoot Web容器 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -70,13 +69,10 @@
             <groupId>com.github.oshi</groupId>
             <artifactId>oshi-core</artifactId>
         </dependency>
-
         <!-- 系统模块-->
         <dependency>
             <groupId>com.xingxi</groupId>
             <artifactId>xingxi-system</artifactId>
         </dependency>
-
     </dependencies>
-
 </project>

08.src/Xingxi/xingxi-framework/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,50 +1,50 @@
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\aspectj\DataSourceAspect.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\DruidConfig.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\service\SysPasswordService.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\service\PermissionService.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\filter\kickout\KickoutSessionFilter.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\datasource\DynamicDataSource.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\domain\server\Cpu.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\aspectj\LogAspect.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\service\DictService.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\properties\DruidProperties.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\manager\factory\AsyncFactory.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\ShiroConfig.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\manager\AsyncManager.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\exception\GlobalExceptionHandler.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\service\CacheService.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\properties\PermitAllUrlProperties.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\session\SpringSessionValidationScheduler.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\filter\LogoutFilter.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\service\SysLoginService.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\service\ConfigService.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\ApplicationConfig.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\manager\ShutdownManager.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\MyBatisConfig.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\filter\online\OnlineSessionFilter.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\domain\server\Jvm.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\domain\server\SysFile.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\domain\server\Sys.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\rememberMe\CustomCookieRememberMeManager.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\interceptor\RepeatSubmitInterceptor.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\service\SysShiroService.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\util\AuthorizationUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\filter\sync\SyncOnlineSessionFilter.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\I18nConfig.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\service\SysRegisterService.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\filter\captcha\CaptchaValidateFilter.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\interceptor\impl\SameUrlDataInterceptor.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\FilterConfig.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\domain\server\Mem.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\realm\UserRealm.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\session\OnlineSessionFactory.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\CaptchaConfig.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\session\OnlineSession.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\KaptchaTextCreator.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\CustomShiroFilterFactoryBean.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\ResourcesConfig.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\session\OnlineWebSessionManager.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\aspectj\PermissionsAspect.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\domain\Server.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\aspectj\DataScopeAspect.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\session\OnlineSessionDAO.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\datasource\DynamicDataSource.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\rememberMe\CustomCookieRememberMeManager.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\util\AuthorizationUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\filter\online\OnlineSessionFilter.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\service\SysRegisterService.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\session\SpringSessionValidationScheduler.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\FilterConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\domain\Server.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\session\OnlineSessionDAO.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\filter\sync\SyncOnlineSessionFilter.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\service\SysShiroService.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\domain\server\SysFile.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\manager\factory\AsyncFactory.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\CaptchaConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\aspectj\PermissionsAspect.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\filter\captcha\CaptchaValidateFilter.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\ShiroConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\MyBatisConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\filter\LogoutFilter.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\manager\AsyncManager.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\KaptchaTextCreator.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\domain\server\Mem.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\manager\ShutdownManager.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\service\DictService.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\exception\GlobalExceptionHandler.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\domain\server\Sys.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\aspectj\LogAspect.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\interceptor\RepeatSubmitInterceptor.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\properties\DruidProperties.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\ResourcesConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\aspectj\DataSourceAspect.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\DruidConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\session\OnlineWebSessionManager.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\session\OnlineSession.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\session\OnlineSessionFactory.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\service\PermissionService.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\properties\PermitAllUrlProperties.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\realm\UserRealm.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\service\SysLoginService.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\service\ConfigService.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\I18nConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\filter\kickout\KickoutSessionFilter.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\interceptor\impl\SameUrlDataInterceptor.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\service\CacheService.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\config\ApplicationConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\aspectj\DataScopeAspect.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\service\SysPasswordService.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\domain\server\Cpu.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\web\domain\server\Jvm.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-framework\src\main\java\com\xingxi\framework\shiro\web\CustomShiroFilterFactoryBean.java

08.src/Xingxi/xingxi-generator/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,13 +1,13 @@
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\domain\GenTable.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\service\IGenTableColumnService.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\config\GenConfig.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\domain\GenTableColumn.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\service\IGenTableService.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\util\VelocityUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\controller\GenController.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\service\impl\GenTableServiceImpl.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\util\GenUtils.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\mapper\GenTableColumnMapper.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\mapper\GenTableMapper.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\util\VelocityInitializer.java
-E:\Work\angela\GoodsMarket\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\service\impl\GenTableColumnServiceImpl.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\config\GenConfig.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\domain\GenTable.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\service\IGenTableColumnService.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\util\GenUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\service\IGenTableService.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\mapper\GenTableColumnMapper.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\controller\GenController.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\service\impl\GenTableColumnServiceImpl.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\util\VelocityUtils.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\mapper\GenTableMapper.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\service\impl\GenTableServiceImpl.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\util\VelocityInitializer.java
+E:\projects\src\GululuQ\08.src\Xingxi\xingxi-generator\src\main\java\com\xingxi\generator\domain\GenTableColumn.java

08.src/Xingxi/xingxi-miniprogram-api/src/main/java/com/xingxi/store/configuration/ConsoleLogAspect.java

@@ -1,6 +1,6 @@
 package com.xingxi.store.configuration;
 
-import cn.com.wingxi.biandan.common.utils.ServletUtils;
+import com.xingxi.common.utils.ServletUtils;
 import com.alibaba.fastjson.JSONObject;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -19,28 +19,30 @@ import java.util.Map;
 /**
  * 操作日志记录处理
  * Around -> Before -> After -> AfterReturning -> AfterThrowing
- * @author hocy
+ *
+ * @author xingxi
  */
 @Aspect
 @Component
-@Profile({"env","local", "druid", "ita"})
+@Profile({"env", "local", "druid", "ita"})
 @Order(10)
-public class ConsoleLogAspect
-{
+public class ConsoleLogAspect {
     private static final Logger log = LoggerFactory.getLogger(ConsoleLogAspect.class);
-    /** 换行符 */
+    /**
+     * 换行符
+     */
     private static final String LINE_SEPARATOR = System.lineSeparator();
+
     // 配置织入点
-    @Pointcut("execution(* cn.com.wingxi.biandan.store.controller.*Controller.*(..))")
-    public void logPointCut()
-    {
+    @Pointcut("execution(* com.xingxi.store.controller.*Controller.*(..))")
+    public void logPointCut() {
     }
 
     /**
-     * 在切点之前织入
-     * @param joinPoint
-     * @throws Throwable
+     * 编制切入点
      *
+     * @param joinPoint 切入点
+     * @throws Throwable 可抛出的异常
      */
     @Before("logPointCut()")
     public void doBefore(JoinPoint joinPoint) throws Throwable {
@@ -69,9 +71,11 @@ public class ConsoleLogAspect
         log.info("Request Args   : {}", params);
         log.info("********************************************** ConsoleLogAspect Request:End **********************************************");
     }
+
     /**
      * 在切点之后织入
-     * @throws Throwable
+     *
+     * @throws Throwable 可抛出的异常
      */
     @After("logPointCut()")
     public void doAfter() throws Throwable {
@@ -81,9 +85,10 @@ public class ConsoleLogAspect
 
     /**
      * 环绕
-     * @param proceedingJoinPoint
+     *
+     * @param proceedingJoinPoint 切入点
      * @return
-     * @throws Throwable
+     * @throws Throwable 可抛出的异常
      */
     @Around("logPointCut()")
     public Object doAround(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {

08.src/Xingxi/xingxi-miniprogram-api/xingxi-miniprogram-api.iml

@@ -160,7 +160,7 @@
     <orderEntry type="library" name="Maven: com.github.binarywang:weixin-java-mp:4.6.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-configuration-processor:2.5.15" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: com.mysql:mysql-connector-j:8.0.33" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.26" level="project" />
+    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-starter-test:2.5.15" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test:2.5.15" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.5.15" level="project" />

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/XingxiMqServerApplication.java

@@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 /**
  * 启动程序
  *
- * @author hocy
+ * @author xingxi
  */
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class XingxiMqServerApplication {

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/common/aspectj/DataSourceAspect.java

@@ -1,6 +1,6 @@
 package com.xingxi.mq.common.aspectj;
 
-import cn.com.wingxi.biandan.common.annotation.DataSource;
+import com.xingxi.common.annotation.DataSource;
 import com.xingxi.mq.common.datasource.DynamicDataSourceContextHolder;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
@@ -17,7 +17,7 @@ import java.lang.reflect.Method;
 /**
  * 多数据源处理
  *
- * @author hocy
+ * @author xingxi
  */
 @Aspect
 @Order(1)

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/common/aspectj/lang/annotation/DataSource.java

@@ -1,6 +1,6 @@
 package com.xingxi.mq.common.aspectj.lang.annotation;
 
-import cn.com.wingxi.biandan.common.enums.DataSourceType;
+import com.xingxi.common.enums.DataSourceType;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -10,7 +10,7 @@ import java.lang.annotation.Target;
 /**
  * 自定义多数据源切换注解
  *
- * @author hocy
+ * @author xingxi
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/common/aspectj/lang/enums/DataSourceType.java

@@ -3,7 +3,7 @@ package com.xingxi.mq.common.aspectj.lang.enums;
 /**
  * 数据源
  *
- * @author hocy
+ * @author xingxi
  */
 public enum DataSourceType {
     /**

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/common/datasource/DynamicDataSource.java

@@ -8,7 +8,7 @@ import java.util.Map;
 /**
  * 动态数据源
  *
- * @author hocy
+ * @author xingxi
  */
 public class DynamicDataSource extends AbstractRoutingDataSource {
     public DynamicDataSource(DataSource defaultTargetDataSource, Map<Object, Object> targetDataSources) {

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/common/datasource/DynamicDataSourceContextHolder.java

@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory;
 /**
  * 数据源切换处理
  *
- * @author hocy
+ * @author xingxi
  */
 public class DynamicDataSourceContextHolder {
     public static final Logger log = LoggerFactory.getLogger(DynamicDataSourceContextHolder.class);

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/config/DruidConfig.java

@@ -1,6 +1,6 @@
 package com.xingxi.mq.config;
 
-import cn.com.wingxi.biandan.common.enums.DataSourceType;
+import com.xingxi.common.enums.DataSourceType;
 import com.xingxi.mq.common.datasource.DynamicDataSource;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
@@ -22,7 +22,7 @@ import java.util.Map;
 /**
  * druid 配置多数据源
  *
- * @author hocy
+ * @author xingxi
  */
 @Configuration
 public class DruidConfig {

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/config/DruidProperties.java

@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration;
 /**
  * druid 配置属性
  *
- * @author hocy
+ * @author xingxi
  */
 @Configuration
 public class DruidProperties {

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/clear/ClearOrderCanceledMqConsumer.java

@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
 
 /**
  * @ClassName ClearOrderCanceledMqConsumer
- * @projectName hocy
+ * @projectName xingxi
  * @Deacription 订单取消消息接受处理
  * @Author FZ.Dong
  * @Date 2020/9/15 16:56

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/clear/ClearOrderFinishedMqConsumer.java

@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * @ClassName ClearOrderReturnedMqConsumer
- * @projectName hocy
+ * @projectName xingxi
  * @Deacription 订单完成消息接受处理
  * @Author FZ.Dong
  * @Date 2020/9/15 16:56

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/clear/ClearOrderPayedMqConsumer.java

@@ -1,579 +0,0 @@
-package com.xingxi.mq.consumer.clear;
-
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import com.xingxi.common.mq.bo.order.OrderBO;
-import com.xingxi.common.mq.constant.OrderMqKey;
-import com.xingxi.common.mq.core.AbstractRabbitConsumer;
-import com.xingxi.mq.server.material.domain.MaterialKindMq;
-import com.xingxi.mq.server.material.service.IMatePriceMqService;
-import com.xingxi.mq.server.material.service.IMaterialKindMqService;
-import com.xingxi.mq.server.product.domain.ProdMateMq;
-import com.xingxi.mq.server.product.service.IProdMateMqService;
-import com.xingxi.mq.server.product.service.IProdPriceMqService;
-import com.xingxi.mq.server.system.service.ISysDeptVoService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @ClassName 订单清分
- * @projectName biandan
- * @Deacription 订单清分
- * @Author FZ.Dong
- * @Date 2020/9/15 16:56
- * @Version 1.0
- **/
-
-
-@Slf4j
-@Component
-public class ClearOrderPayedMqConsumer extends AbstractRabbitConsumer {
-
-//    @Resource
-//    private IMerchantService iMerchantService;
-//
-//    @Resource
-//    private IVendorService iVendorService;
-
-//    @Resource
-//    private ISysDeptVoService iSysDeptVoService;
-//
-//    @Resource
-//    private IOrderService iOrderService;
-//
-//    @Resource
-//    private IOrderDetailService iOrderDetailService;
-//
-//    @Resource
-//    private IClearOrderService iClearOrderService;
-//
-//    @Resource
-//    private IClearOrderDetailService iClearOrderDetailService;
-//
-//    @Resource
-//    private IProdService iProdService;
-
-    @Resource
-    private IMaterialKindMqService iMaterialKindMqService;
-
-    @Resource
-    private IProdMateMqService iProdMateMqService;
-
-    @Resource
-    private IProdPriceMqService iProdPriceMqService;
-
-    @Resource
-    private IMatePriceMqService iMatePriceMqService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_CLEAR_FOR_PAYED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(
-                OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_CLEAR_FOR_PAYED,
-                OrderMqKey.EDIT_ROUTE_FOR_PAYED
-        ));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_CLEAR_FOR_PAYED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("清分订单创建MQ,处理推送的订单数据【{}】.", body);
-
-        // 消息唯一id
-        String messageId = message.getMessageProperties().getMessageId();
-        // json对象转换
-        OrderBO orderBo = JSON.parseObject(body, OrderBO.class);
-
-        // 通过订单id查询是否存在
-//        List<ClearOrder> exists = iClearOrderService.selectClearOrderByOrderId(orderBo.getOrderId());
-        // ack
-//        if (CollectionUtils.isNotEmpty(exists)) {
-//            log.info("清分订单创建MQ,订单【{}】数据已存在.", orderBo.getOrderNo());
-//            // 处理成功
-//            return true;
-//        } else {
-//            // 原始订单信息
-//            Order orgOrder = iOrderService.selectOrderByOrderId(orderBo.getOrderId());
-//
-//            // 订单明细
-//            List<OrderDetail> orderDetailList = iOrderDetailService.selectOrderDetailByOrderId(orderBo.getOrderId());
-//
-//            // M2C
-//            buildM2CClearOrder(orgOrder, orderDetailList);
-//
-//            // M2M,M2P,P2V
-//            buildM2MClearOrder(orgOrder, orderDetailList, orgOrder.getSellerId(), orgOrder.getSellerRole());
-//
-//            //buildV2PClearOrder(orgOrder, orderDetailList);
-//
-//            log.info("清分订单创建MQ,订单【{}】数据处理完成.", orderBo.getOrderNo());
-//            // 处理成功
-//            return true;
-//        }
-
-        //TODO
-        return true;
-    }
-
-    /**
-     * 构建M2C清分数据, C端与商户
-     *
-     * @param order
-     */
-//    public void buildM2CClearOrder(Order order, List<OrderDetail> orderDetailList) {
-//
-//        String opName = "清分订单创建MQ";
-//        Date nowDate = DateUtils.getNowDate();
-//
-//        // 构建清分数据对象
-//        ClearOrder nco = new ClearOrder();
-//        nco.setOrderId(order.getOrderId());      // 订单ID
-//        nco.setOrderNo(order.getOrderNo());      // 订单号
-//        nco.setBuyerId(order.getBuyerId());      // 购买方编号
-//        nco.setBuyerRole(order.getBuyerRole());  // 购买方角色
-//        nco.setTradeType(ETradeType.M2C.getVal());                     // 交易区分
-//        nco.setSellerId(order.getSellerId());    // 销售方编号
-//        nco.setSellerRole(order.getSellerRole());// 销售方角色
-//        nco.setPayeeId(order.getPayeeId());
-//        nco.setPayeeRole(order.getPayeeRole());
-//        nco.setFinishTime(order.getFinishTime());// 订单完成时间
-//        nco.setOrderStatus(order.getOrderStatus());// 订单状态
-//        //nco.setSettleTime();// 结算时间
-//        nco.setSettleStatus(ESettleStatus.UNSETTLED.getVal());// 结算状态
-//        //nco.setInvoiceTime();// 开票时间
-//        nco.setInvoiceStatus(EInvoiceStatus.UNBILLED.getVal()); // 开票状态
-//        nco.setDelFlag(EDelete.FALSE.getVal());     // 删除标志（0代表存在 2代表删除）
-//        nco.setCreateUser(opName);  // 创建用户
-//        nco.setCreateTime(nowDate); // 创建时间
-//        nco.setUpdateUser(opName);  // 更新用户
-//        nco.setUpdateTime(nowDate); // 更新时间
-//        iClearOrderService.insertClearOrder(nco);
-//
-//        // 循环处理子订单
-//        for (OrderDetail od : orderDetailList) {
-//            ClearOrderDetail ncod = new ClearOrderDetail();
-//            ncod.setOrderId(od.getOrderId());       // 订单ID
-//            ncod.setOrderNo(nco.getOrderNo());      // 订单号
-//            ncod.setOrderDetailId(od.getOrderDetailId());// 订单明细ID
-//            ncod.setBuyerId(nco.getBuyerId());      // 购方ID
-//            ncod.setBuyerRole(nco.getBuyerRole());  // 购方角色
-//            ncod.setSellerId(nco.getSellerId());    // 销方ID
-//            ncod.setSellerRole(nco.getSellerRole());// 销方角色
-//            ncod.setTradeType(nco.getTradeType());  // 交易区分
-//            ncod.setSuiteId(od.getSuiteId());
-//            ncod.setProdId(od.getProdId());         // 商品ID
-//            ncod.setProdName(od.getProdName());     // 商品名
-//            ncod.setPprId(od.getPprId());           // 商品属性组合ID
-//            ncod.setPprName(od.getPprName());       // 商品属性组合名
-//            ncod.setOrgProdId(od.getOrgProdId());   // 元商品ID
-//            ncod.setMateId(od.getMateId());         // 素材ID
-//            ncod.setMateName(od.getMateName());     // 素材名称
-//            ncod.setProdType(od.getProdType());     // 商品区分
-//            ncod.setPfSellFlag(od.getPfSellFlag()); // 平台经销标志
-//            ncod.setBuyPrice(od.getBuyPrice());     // 购方购买单价
-//            ncod.setSalePrice(od.getSalePrice());   // 销方结算价
-//            ncod.setSurfaceQty(od.getSurfaceQty());
-//            ncod.setUnitQty(od.getUnitQty());
-//            ncod.setOrderQty(od.getBuyQty());       // 订单数量
-//            ncod.setReturnQty(od.getReturnQty());   // 退货数量
-//            ncod.setServiceRate(order.getServiceRate()); //  服务费率
-//            ncod.setFinishTime(od.getFinishTime()); // 订单完成时间
-//            ncod.setOrderStatus(od.getOrderDetailStatus());// 订单状态
-////            ncod.setSettleTime();// 结算时间
-//            ncod.setSettleStatus(ESettleStatus.UNSETTLED.getVal());// 结算状态
-////            ncod.setInvoiceTime();// 开票时间
-//            ncod.setInvoiceStatus(EInvoiceStatus.UNBILLED.getVal());// 开票状态
-////            ncod.setSettleBatchNo("");// 结算批次号
-////            ncod.setInvoiceBatchNo("");// 开票批次号
-////            ncod.setInvoiceBillNo("");// 发票请求流水号
-//            ncod.setDelFlag(EDelete.FALSE.getVal());// 删除标志（0代表存在 2代表删除）
-//            ncod.setCreateUser(opName);             // 创建用户
-//            ncod.setCreateTime(nowDate);            // 创建时间
-//            ncod.setUpdateUser(opName);             // 更新用户
-//            ncod.setUpdateTime(nowDate);            // 更新时间
-//            iClearOrderDetailService.insertClearOrderDetail(ncod);
-//        }
-//    }
-
-    /**
-     * 构建M2M清分数据 商户与上级商户或者平台
-     *
-     * @param order
-     */
-//    public void buildM2MClearOrder(Order order, List<OrderDetail> orderDetailList, Long buyerId, String buyerRole) {
-//
-//        String opName = "清分订单创建MQ";
-//        Date nowDate = DateUtils.getNowDate();
-//
-//        // 商户的上级部门，可能是商户或者平台
-//        SysDept sellerDept = iSysDeptVoService.selectParentDeptByDeptId(buyerId);
-//        Long sellerId = sellerDept.getDeptId();
-//        // 平台在商户表存在预置数据
-//        Merchant sellerMerc = iMerchantService.selectMerchantByMercId(sellerId);
-//        List<OrderDetail> unpackDetailList = new ArrayList<>();
-//
-//        for (OrderDetail od : orderDetailList) {
-//            if(EDelete.TRUE.getVal().equals(od.getDelFlag())) {
-//                // 自营商品在前面舍弃了
-//                continue;
-//            }
-////====================================================================
-////            FIXED("FIXED", "固化商品"),               //2023-05-30 逻辑暂不考虑
-////            HALF_FIXED("HALF_FIXED", "半固化商品"),    //2023-05-30 逻辑暂不考虑
-////            MERCPROD("MERC_PRODUCT", "商户商品"),     //2023-05-30 商户与商户之间结算
-////====================================================================
-////            MERCMATE("MERC_MATERIAL", "商户素材"),    //2023-05-30 逻辑暂不考虑
-////====================================================================
-////            NORMAL("NORMAL", "常规商品"),             //2023-05-30 商户与商户之间结算，商户与供应商的结算在商户后台下单时进行，平台经销商品需要生成B2P，P2V
-////            CUSTOMIZABLE("CUSTOMIZABLE", "定制商品"), //2023-05-30 逻辑暂不考虑
-////            MATERIAL("MATERIAL", "素材");           //2023-05-30 逻辑暂不考虑
-////====================================================================
-//            if (EProdType.FIXED.getVal().equals(od.getProdType())
-//                    || EProdType.HALF_FIXED.getVal().equals(od.getProdType())) {
-//
-//                // 商品的归属商户
-//                if(od.getVendorId().longValue() != buyerId.longValue()) {
-//                    // 非自营，保留
-//                    OrderDetail nod = new OrderDetail();
-//                    BeanUtils.copyBeanProp(nod, od);
-//                    unpackDetailList.add(nod);
-//                } else {
-//                    // 商品固化设计面数量
-//                    int surfaceQty = iProdMateMqService.selectProdMateSurfaceQty(od.getProdId(), od.getPprId());
-//                    Prod orgProd = iProdService.selectProdByProdId(od.getOrgProdId());
-//                    OrderDetail nod = new OrderDetail();
-//                    BeanUtils.copyBeanProp(nod, od);
-//                    nod.setProdId(orgProd.getProdId());
-//                    nod.setProdName(orgProd.getProdName());
-//                    nod.setProdType(orgProd.getProdType());
-//                    nod.setSurfaceQty(surfaceQty + od.getSurfaceQty());
-//                    unpackDetailList.add(nod);
-//
-//                    // 查询所用素材
-//                    List<ProdMateMq> prodMateList = iProdMateMqService.selectProdMateUnitQty(od.getProdId(), od.getPprId());
-//                    for(ProdMateMq pmm : prodMateList) {
-//                        // 素材的归属商户
-//                        MaterialKindMq mkm = iMaterialKindMqService.selectMaterialKindMqByMateId(pmm.getMateId());
-//                        if(mkm.getMercId().longValue() != buyerId.longValue()) {
-//                            OrderDetail nmod = new OrderDetail();
-//                            nmod.setOrderDetailId(od.getOrderDetailId());
-//                            nmod.setOrderId(od.getOrderId());
-//                            nmod.setSuiteId(od.getSuiteId());
-//                            nmod.setProdId(orgProd.getProdId());
-//                            nmod.setProdName(orgProd.getProdName());
-//                            if(EMateBelong.MERC.getVal().equals(mkm.getMateBelong())) {
-//                                nmod.setProdType(EProdType.MERCMATE.getVal());
-//                            } else {
-//                                nmod.setProdType(EProdType.MATERIAL.getVal());
-//                            }
-//                            nmod.setMateId(pmm.getMateId());
-//                            nmod.setMateName(pmm.getMateName());
-//                            //nmod.setMateType(EMateType);
-//                            nmod.setVendorId(mkm.getVendorId());
-//                            nmod.setSurfaceQty(0);
-//                            nmod.setUnitQty(pmm.getMateQty());
-//                            nmod.setBuyQty(od.getBuyQty());
-//                            nmod.setAfterQty(od.getAfterQty());
-//                            nmod.setReturnQty(od.getReturnQty());
-//                            nmod.setBuyPrice(od.getSalePrice());
-//                            nmod.setSurfaceQty(surfaceQty + od.getSurfaceQty());
-//                            nmod.setOrderDetailStatus(od.getOrderDetailStatus());
-//                            unpackDetailList.add(nmod);
-//                        }
-//                    }
-//                }
-//            }  else if(EProdType.MERCPROD.getVal().equals(od.getProdType())) {
-//                // 商户商品的归属商户
-//                if(od.getVendorId().longValue() != buyerId.longValue()) {
-//                    // 非自营，保留
-//                    OrderDetail nod = new OrderDetail();
-//                    BeanUtils.copyBeanProp(nod, od);
-//                    unpackDetailList.add(nod);
-//                } else {
-//                    // 自营素材，舍弃
-//                    // 借用delFlag，后续供应链不在统计
-//                    od.setDelFlag(EDelete.TRUE.getVal());
-//                }
-//            } else if(EProdType.MERCMATE.getVal().equals(od.getProdType())) {
-//                // 素材的归属商户
-//                MaterialKindMq mkm = iMaterialKindMqService.selectMaterialKindMqByMateId(od.getMateId());
-//                if(mkm.getMercId().longValue() != buyerId.longValue()) {
-//                    // 非自营，保留
-//                    OrderDetail nod = new OrderDetail();
-//                    BeanUtils.copyBeanProp(nod, od);
-//                    unpackDetailList.add(nod);
-//                } else {
-//                    // 自营素材，舍弃
-//                    // 借用delFlag，后续供应链不在统计
-//                    od.setDelFlag(EDelete.TRUE.getVal());
-//                }
-//            } else {
-////            NORMAL("NORMAL", "常规商品"),
-////            CUSTOMIZABLE("CUSTOMIZABLE", "定制商品"),
-////            MATERIAL("MATERIAL", "素材");
-//                // 归属平台，保留
-//                // 平台经销商品且销售方为平台时需要
-//                if((EDeptType.PLATFORM.getVal().equals(sellerDept.getDeptType()) && EYesNo.YES.getVal().equals(od.getPfSellFlag()))
-//                    || EDeptType.MERCHANT.getVal().equals(sellerDept.getDeptType())) {
-//                    OrderDetail nod = new OrderDetail();
-//                    BeanUtils.copyBeanProp(nod, od);
-//                    unpackDetailList.add(nod);
-//                }
-//            }
-//        }
-//
-//        if(!unpackDetailList.isEmpty()) {
-//            // M2M,M2P
-//            // 构建清分数据对象
-//            ClearOrder nco = new ClearOrder();
-//            nco.setOrderId(order.getOrderId());      // 订单ID
-//            nco.setOrderNo(order.getOrderNo());      // 订单号
-//            nco.setBuyerId(buyerId);      // 购买方编号
-//            nco.setBuyerRole(buyerRole);  // 购买方角色
-//            nco.setTradeType(getTradeType(buyerRole, sellerDept.getDeptType()).getVal());                     // 交易区分
-//            nco.setSellerId(sellerId);    // 销售方编号
-//            nco.setSellerRole(sellerDept.getDeptType());// 销售方角色
-//            nco.setPayeeId(order.getPayeeId());
-//            nco.setPayeeRole(order.getPayeeRole());
-//            nco.setFinishTime(order.getFinishTime());// 订单完成时间
-//            nco.setOrderStatus(order.getOrderStatus());// 订单状态
-//            //nco.setSettleTime();// 结算时间
-//            nco.setSettleStatus(ESettleStatus.UNSETTLED.getVal());// 结算状态
-//            //nco.setInvoiceTime();// 开票时间
-//            nco.setInvoiceStatus(EInvoiceStatus.UNBILLED.getVal()); // 开票状态
-//            nco.setDelFlag(EDelete.FALSE.getVal());     // 删除标志（0代表存在 2代表删除）
-//            nco.setCreateUser(opName);  // 创建用户
-//            nco.setCreateTime(nowDate); // 创建时间
-//            nco.setUpdateUser(opName);  // 更新用户
-//            nco.setUpdateTime(nowDate); // 更新时间
-//            iClearOrderService.insertClearOrder(nco);
-//
-//            // 循环处理子订单
-//            for (OrderDetail od : unpackDetailList) {
-//                ClearOrderDetail ncod = new ClearOrderDetail();
-//                ncod.setOrderId(od.getOrderId());       // 订单ID
-//                ncod.setOrderNo(nco.getOrderNo());      // 订单号
-//                ncod.setOrderDetailId(od.getOrderDetailId());// 订单明细ID
-//                ncod.setBuyerId(nco.getBuyerId());      // 购方ID
-//                ncod.setBuyerRole(nco.getBuyerRole());  // 购方角色
-//                ncod.setSellerId(nco.getSellerId());    // 销方ID
-//                ncod.setSellerRole(nco.getSellerRole());// 销方角色
-//                ncod.setTradeType(nco.getTradeType());  // 交易区分
-//                ncod.setSuiteId(od.getSuiteId());
-//                ncod.setProdId(od.getProdId());         // 商品ID
-//                ncod.setProdName(od.getProdName());     // 商品名
-//                ncod.setPprId(od.getPprId());           // 商品属性组合ID
-//                ncod.setPprName(od.getPprName());       // 商品属性组合名
-//                ncod.setOrgProdId(od.getOrgProdId());   // 元商品ID
-//                ncod.setMateId(od.getMateId());         // 素材ID
-//                ncod.setMateName(od.getMateName());     // 素材名称
-//                ncod.setProdType(od.getProdType());     // 商品区分
-//                ncod.setPfSellFlag(od.getPfSellFlag()); // 平台经销标志
-//                ncod.setBuyPrice(getPrice(ncod, nco.getBuyerId(), nco.getSellerId()));     // 购方购买单价
-//
-//                // 销方结算价
-//                Long vendorId = 100L; // 平台
-//                if(EDeptType.MERCHANT.getVal().equals(sellerDept.getDeptType())) {
-//                    vendorId = sellerDept.getParentId();
-//                }
-//                od.setSalePrice(getPrice(ncod, nco.getSellerId(), vendorId));
-//
-//                ncod.setSalePrice(od.getSalePrice());   // 销方结算价
-//                ncod.setOrderQty(od.getBuyQty());       // 订单数量
-//                ncod.setReturnQty(od.getReturnQty());   // 退货数量
-//                ncod.setServiceRate(sellerMerc.getServiceRate());   //  服务费率
-//                ncod.setFinishTime(od.getFinishTime()); // 订单完成时间
-//                ncod.setOrderStatus(od.getOrderDetailStatus());// 订单状态
-//    //            ncod.setSettleTime();// 结算时间
-//                ncod.setSettleStatus(ESettleStatus.UNSETTLED.getVal());// 结算状态
-//    //            ncod.setInvoiceTime();// 开票时间
-//                ncod.setInvoiceStatus(EInvoiceStatus.UNBILLED.getVal());// 开票状态
-//    //            ncod.setSettleBatchNo("");// 结算批次号
-//    //            ncod.setInvoiceBatchNo("");// 开票批次号
-//    //            ncod.setInvoiceBillNo("");// 发票请求流水号
-//                ncod.setDelFlag(EDelete.FALSE.getVal());// 删除标志（0代表存在 2代表删除）
-//                ncod.setCreateUser(opName);             // 创建用户
-//                ncod.setCreateTime(nowDate);            // 创建时间
-//                ncod.setUpdateUser(opName);             // 更新用户
-//                ncod.setUpdateTime(nowDate);            // 更新时间
-//                iClearOrderDetailService.insertClearOrderDetail(ncod);
-//            }
-//            // V2M
-//            if(EDeptType.PLATFORM.getVal().equals(sellerDept.getDeptType())) {
-//                // 构建清分数据对象
-//                buildV2MClearOrder(order,unpackDetailList, buyerId);
-//            }
-//        }
-//        if(EDeptType.MERCHANT.getVal().equals(sellerDept.getDeptType())) {
-//            // 上级供应商
-//            buildM2MClearOrder(order, unpackDetailList, sellerId, sellerDept.getDeptType());
-//        }
-//    }
-
-    /**
-     * 构建清分数据 经销商与供应商
-     *
-     * @param order
-     */
-//    public void buildV2MClearOrder(Order order, List<OrderDetail> orderDetailList, Long buyerId) {
-//
-//        String opName = "清分订单创建MQ";
-//        Date nowDate = DateUtils.getNowDate();
-//
-//        // 供应商
-//        // 按照供应商分组
-//        Map<Long, List<OrderDetail>> orderMap = orderDetailList.stream().collect(Collectors.groupingBy(item -> item.getVendorId()));
-//        for (Map.Entry<Long, List<OrderDetail>> orderEntry : orderMap.entrySet()) {
-//            Long vendorId = orderEntry.getKey();
-//            Vendor vendor = iVendorService.selectVendorByVendorId(vendorId);
-//            if(vendor == null){
-//                continue;
-//            }
-//
-//            // 明细
-//            List<OrderDetail> details = orderEntry.getValue();
-//
-//            // 构建清分数据对象
-//            ClearOrder nco = new ClearOrder();
-//            nco.setOrderId(order.getOrderId());      // 订单ID
-//            nco.setOrderNo(order.getOrderNo());      // 订单号
-//            nco.setBuyerId(buyerId);      // 购买方编号
-//            nco.setBuyerRole(ERoleKey.MERCHANT.getCode());  // 购买方角色
-//            nco.setTradeType(ETradeType.V2P.getVal());                     // 交易区分
-//            nco.setSellerId(vendorId);    // 销售方编号
-//            nco.setSellerRole(ERoleKey.VENDOR.getCode());// 销售方角色
-//            nco.setPayeeId(order.getPayeeId());
-//            nco.setPayeeRole(order.getPayeeRole());
-//            nco.setFinishTime(order.getFinishTime());// 订单完成时间
-//            nco.setOrderStatus(order.getOrderStatus());// 订单状态
-//            //nco.setSettleTime();// 结算时间
-//            nco.setSettleStatus(ESettleStatus.UNSETTLED.getVal());// 结算状态
-//            //nco.setInvoiceTime();// 开票时间
-//            nco.setInvoiceStatus(EInvoiceStatus.UNBILLED.getVal()); // 开票状态
-//            nco.setDelFlag(EDelete.FALSE.getVal());     // 删除标志（0代表存在 2代表删除）
-//            nco.setCreateUser(opName);  // 创建用户
-//            nco.setCreateTime(nowDate); // 创建时间
-//            nco.setUpdateUser(opName);  // 更新用户
-//            nco.setUpdateTime(nowDate); // 更新时间
-//            iClearOrderService.insertClearOrder(nco);
-//
-//            // 循环处理子订单
-//            for (OrderDetail od : details) {
-//                ClearOrderDetail ncod = new ClearOrderDetail();
-//                ncod.setOrderId(od.getOrderId());       // 订单ID
-//                ncod.setOrderNo(nco.getOrderNo());      // 订单号
-//                ncod.setOrderDetailId(od.getOrderDetailId());// 订单明细ID
-//                ncod.setBuyerId(nco.getBuyerId());      // 购方ID
-//                ncod.setBuyerRole(nco.getBuyerRole());  // 购方角色
-//                ncod.setSellerId(nco.getSellerId());    // 销方ID
-//                ncod.setSellerRole(nco.getSellerRole());// 销方角色
-//                ncod.setTradeType(nco.getTradeType());  // 交易区分
-//                ncod.setSuiteId(od.getSuiteId());
-//                ncod.setProdId(od.getProdId());         // 商品ID
-//                ncod.setProdName(od.getProdName());     // 商品名
-//                ncod.setPprId(od.getPprId());           // 商品属性组合ID
-//                ncod.setPprName(od.getPprName());       // 商品属性组合名
-//                ncod.setOrgProdId(od.getOrgProdId());   // 元商品ID
-//                ncod.setMateId(od.getMateId());         // 素材ID
-//                ncod.setMateName(od.getMateName());     // 素材名称
-//                ncod.setProdType(od.getProdType());     // 商品区分
-//                ncod.setPfSellFlag(od.getPfSellFlag()); // 平台经销标志
-//                ncod.setBuyPrice(getPrice(ncod, nco.getBuyerId(), nco.getSellerId()));     // 购方购买单价
-//                ncod.setSalePrice(getPrice(ncod, nco.getSellerId(), nco.getSellerId()));   // 销方结算价
-//                ncod.setOrderQty(od.getBuyQty());       // 订单数量
-//                ncod.setReturnQty(od.getReturnQty());   // 退货数量
-//                ncod.setServiceRate(vendor.getServiceRate());                 //  服务费率 TODO
-//                ncod.setFinishTime(od.getFinishTime()); // 订单完成时间
-//                ncod.setOrderStatus(od.getOrderDetailStatus());// 订单状态
-////            ncod.setSettleTime();// 结算时间
-//                ncod.setSettleStatus(ESettleStatus.UNSETTLED.getVal());// 结算状态
-////            ncod.setInvoiceTime();// 开票时间
-//                ncod.setInvoiceStatus(EInvoiceStatus.UNBILLED.getVal());// 开票状态
-////            ncod.setSettleBatchNo("");// 结算批次号
-////            ncod.setInvoiceBatchNo("");// 开票批次号
-////            ncod.setInvoiceBillNo("");// 发票请求流水号
-//                ncod.setDelFlag(EDelete.FALSE.getVal());// 删除标志（0代表存在 2代表删除）
-//                ncod.setCreateUser(opName);             // 创建用户
-//                ncod.setCreateTime(nowDate);            // 创建时间
-//                ncod.setUpdateUser(opName);             // 更新用户
-//                ncod.setUpdateTime(nowDate);            // 更新时间
-//                iClearOrderDetailService.insertClearOrderDetail(ncod);
-//            }
-//        }
-//    }
-
-    /**
-     * 交易区分
-     *
-     * @param buyerRole
-     * @param sellerRole
-     * @return
-     */
-//    private ETradeType getTradeType(String buyerRole, String sellerRole){
-//        if(ERoleKey.CUSTOMER.getCode().equals(buyerRole)){
-//            if(ERoleKey.MERCHANT.getCode().equals(sellerRole)) {
-//                return ETradeType.M2C;
-//            }
-//        } else if(ERoleKey.MERCHANT.getCode().equals(buyerRole)) {
-//            if(ERoleKey.MERCHANT.getCode().equals(sellerRole)) {
-//                return ETradeType.M2M;
-//            } else if(ERoleKey.PLATFORM.getCode().equals(sellerRole)){
-//                return ETradeType.P2M;
-//            }
-//        }
-//        return ETradeType.V2P;
-//    }
-
-    /**
-     * 取价格
-     *
-     * @param clearOrderDetail
-     * @return
-     */
-//    private BigDecimal getPrice(ClearOrderDetail clearOrderDetail, Long buyerId, Long salesmanId) {
-//
-//        if(EProdType.NORMAL.getVal().equals(clearOrderDetail.getProdType())
-//                || EProdType.CUSTOMIZABLE.getVal().equals(clearOrderDetail.getProdType())
-//                || EProdType.FIXED.getVal().equals(clearOrderDetail.getProdType())
-//                || EProdType.HALF_FIXED.getVal().equals(clearOrderDetail.getProdType())
-//                || EProdType.MERCPROD.getVal().equals(clearOrderDetail.getProdType())) {
-//            // 查询商品价格
-//            ProdPrice spp = new ProdPrice();
-//            spp.setProdId(clearOrderDetail.getProdId());
-//            spp.setPprId(clearOrderDetail.getPprId());
-//            spp.setBuyerId(buyerId);
-//            spp.setSalesmanId(salesmanId);
-//            spp.setSurfaceQty(clearOrderDetail.getSurfaceQty());
-//
-//            return iProdPriceMqService.getProdPriceByUnionId(spp);
-//        } else {
-//            // 查询素材价格
-//            MatePrice smp = new MatePrice();
-//            smp.setMateId(clearOrderDetail.getMateId());
-//            smp.setBuyerId(buyerId);
-//            smp.setSalesmanId(salesmanId);
-//            return iMatePriceMqService.getMatePriceByUnionId(smp);
-//        }
-//    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/clear/ClearOrderReturnedMqConsumer.java

@@ -1,6 +1,5 @@
 package com.xingxi.mq.consumer.clear;
 
-import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.rabbitmq.client.Channel;
 import com.xingxi.common.mq.constant.OrderMqKey;
@@ -20,7 +19,7 @@ import java.util.List;
 
 /**
  * @ClassName ClearOrderReturnedMqConsumer
- * @projectName hocy
+ * @projectName xingxi
  * @Deacription 订单退货消息接受处理
  *              更新退货数量
  * @Author FZ.Dong

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/commission/CommissionOrderCanceledConsumer.java

@@ -1,131 +0,0 @@
-package com.xingxi.mq.consumer.commission;
-
-import cn.com.wingxi.biandan.common.enums.EDelete;
-import cn.com.wingxi.biandan.common.mq.bo.order.OrderCanceledBO;
-import cn.com.wingxi.biandan.common.mq.constant.OrderMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import com.xingxi.mq.server.order.service.ICommissionOrderDetailVoService;
-import com.xingxi.mq.server.order.service.ICommissionOrderVoService;
-import com.xingxi.mq.server.report.service.ICommissionMoneyDayVoService;
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrder;
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrderDetail;
-import cn.com.wingxi.biandan.system.order.service.ICommissionOrderDetailService;
-import cn.com.wingxi.biandan.system.order.service.ICommissionOrderService;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-
-@Slf4j
-@Component
-public class CommissionOrderCanceledConsumer extends AbstractRabbitConsumer
-{
-    @Resource
-    private ICommissionOrderService iCommissionOrderService;
-
-    @Resource
-    private ICommissionOrderVoService iCommissionOrderVoService;
-
-    @Resource
-    private ICommissionOrderDetailService iCommissionOrderDetailService;
-
-    @Resource
-    private ICommissionOrderDetailVoService iCommissionOrderDetailVoService;
-
-    @Resource
-    private ICommissionMoneyDayVoService iCommissionMoneyDayVoService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_COMMISSION_FOR_CANCELED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_COMMISSION_FOR_CANCELED,
-                OrderMqKey.EDIT_ROUTE_FOR_CANCELED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_COMMISSION_FOR_CANCELED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("推广者分佣订单取消MQ,处理推送的订单数据【{}】.", body);
-
-        Date nowDate = DateUtils.getNowDate();
-
-        List<OrderCanceledBO> canceledBos = JSON.parseArray(body, OrderCanceledBO.class);
-
-        for (OrderCanceledBO ocbo : canceledBos) {
-            CommissionOrderDetail scod = new CommissionOrderDetail();
-            scod.setOrderId(ocbo.getOrderId());
-            scod.setOrderDetailId(ocbo.getOrderDetailId());
-            scod.setSuiteId(ocbo.getSuiteId());
-            scod.setDelFlag(EDelete.FALSE.getVal());
-            List<CommissionOrderDetail> cods = iCommissionOrderDetailService.selectCommissionOrderDetailList(scod);
-            if(CollectionUtils.isEmpty(cods)) {
-                continue;
-            }
-            scod = cods.get(0);
-
-            CommissionOrder sco = new CommissionOrder();
-            sco.setOrderId(scod.getOrderId());
-            sco.setBuyerId(scod.getBuyerId());
-            sco.setSellerId(scod.getSellerId());
-            sco.setDelFlag(EDelete.FALSE.getVal());
-            List<CommissionOrder> cos = iCommissionOrderService.selectCommissionOrderList(sco);
-            if(CollectionUtils.isEmpty(cos)) {
-                continue;
-            }
-            sco = cos.get(0);
-
-            BigDecimal changeOrderAmountTotal = BigDecimal.ZERO;
-            BigDecimal changeCommissionAmountTotal = BigDecimal.ZERO;
-
-            for (CommissionOrderDetail cod : cods) {
-                CommissionOrderDetail ucod = new CommissionOrderDetail();
-                ucod.setId(cod.getId());
-                // 变化汇总
-                changeOrderAmountTotal = changeOrderAmountTotal.add(CommissionUtils.calcOrderAmount(cod));
-                changeCommissionAmountTotal = changeCommissionAmountTotal.add(cod.getCommissionAmount());
-
-                cod.setCommissionAmount(cod.getCommissionAmount());
-                cod.setReturnQty(cod.getOrderQty());
-                cod.setUpdateUser("推广者分佣订单取消MQ");
-                cod.setUpdateTime(nowDate);
-                iCommissionOrderDetailVoService.updateCommissionOrderDetailVo(cod);
-            }
-
-            if(CommissionUtils.isShareProfit(sco)) {
-                sco.setOrderAmount(changeOrderAmountTotal);
-                sco.setTotalAmount(changeCommissionAmountTotal);
-                sco.setUpdateUser("推广者分佣订单取消MQ");
-                sco.setUpdateTime(nowDate);
-                iCommissionOrderVoService.updateCommissionOrderVo(sco);
-
-                // 更新日月报表
-                sco.setOrderAmount(changeOrderAmountTotal.multiply(new BigDecimal("-1")));
-                sco.setTotalAmount(changeCommissionAmountTotal.multiply(new BigDecimal("-1")));
-                iCommissionMoneyDayVoService.recordCommissionMoney(sco);
-            }
-
-        }
-        log.info("推广者分佣订单取消MQ,订单数据处理完成.");
-        return true;
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/commission/CommissionOrderFinishedConsumer.java

@@ -1,102 +0,0 @@
-package com.xingxi.mq.consumer.commission;
-
-import cn.com.wingxi.biandan.common.enums.EOrderDetailStatus;
-import cn.com.wingxi.biandan.common.enums.EOrderStatus;
-import cn.com.wingxi.biandan.common.mq.bo.order.OrderFinishedBO;
-import cn.com.wingxi.biandan.common.mq.constant.OrderMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import com.xingxi.mq.server.order.service.IOrderDetailVoService;
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrder;
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrderDetail;
-import cn.com.wingxi.biandan.system.order.service.ICommissionOrderDetailService;
-import cn.com.wingxi.biandan.system.order.service.ICommissionOrderService;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-
-@Slf4j
-@Component
-public class CommissionOrderFinishedConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private IOrderDetailVoService orderDetailVoService;
-
-    @Resource
-    private ICommissionOrderService iCommissionOrderService;
-
-    @Resource
-    private ICommissionOrderDetailService iCommissionOrderDetailService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_COMMISSION_FOR_FINISHED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(
-                this.bind(OrderMqKey.EDIT_EXCHANGE,
-                        OrderMqKey.EDIT_QUEUE_COMMISSION_FOR_FINISHED,
-                        OrderMqKey.EDIT_ROUTE_FOR_FINISHED));
-    }
-
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_COMMISSION_FOR_FINISHED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("推广者佣金订单完成MQ, 处理推送的订单数据【{}】.", body);
-        OrderFinishedBO orderFinishedBO = JSON.parseObject(body, OrderFinishedBO.class);
-
-        Date nowDate = DateUtils.getNowDate();
-
-        Long orderId = orderFinishedBO.getOrderId();
-
-        CommissionOrderDetail scod = new CommissionOrderDetail();
-        scod.setOrderId(orderFinishedBO.getOrderId());
-        scod.setOrderDetailId(orderFinishedBO.getOrderDetailId());
-        scod.setSuiteId(orderFinishedBO.getSuiteId());
-        List<CommissionOrderDetail> cods = iCommissionOrderDetailService.selectCommissionOrderDetailList(scod);
-        if(CollectionUtils.isEmpty(cods)) {
-            log.info("推广者佣金订单完成MQ： 订单【{}】明细表不存在，不做处理.", orderId);
-            return true;
-        }
-
-        for (CommissionOrderDetail cod : cods) {
-            CommissionOrderDetail ucod = new CommissionOrderDetail();
-            ucod.setId(cod.getId());
-            ucod.setOrderDetailStatus(EOrderDetailStatus.FINISHED.getVal());
-            ucod.setFinishTime(nowDate);
-            ucod.setUpdateUser("推广者佣金订单完成MQ");
-            ucod.setUpdateTime(nowDate);
-            iCommissionOrderDetailService.updateCommissionOrderDetail(ucod);
-        }
-
-        if(orderDetailVoService.checkOrderFinished(orderFinishedBO.getOrderId()) <= 0) {
-            CommissionOrder uco = new CommissionOrder();
-            uco.setOrderId(orderFinishedBO.getOrderId());
-            uco.setOrderStatus(EOrderStatus.FINISHED.getVal());
-            uco.setFinishTime(nowDate);
-            uco.setUpdateUser("推广者佣金订单完成MQ");
-            uco.setUpdateTime(nowDate);
-            iCommissionOrderService.updateCommissionOrder(uco);
-        }
-        log.info("推广者佣金订单完成MQ,订单【{}】数据处理完成.", orderId);
-        return true;
-    }
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/commission/CommissionOrderPayedConsumer.java

@@ -1,227 +0,0 @@
-package com.xingxi.mq.consumer.commission;
-
-import cn.com.wingxi.biandan.common.enums.EDelete;
-import cn.com.wingxi.biandan.common.mq.bo.order.OrderBO;
-import cn.com.wingxi.biandan.common.mq.constant.OrderMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import cn.com.wingxi.biandan.common.utils.StringUtils;
-import com.xingxi.mq.server.report.service.ICommissionMoneyDayVoService;
-import cn.com.wingxi.biandan.common.core.domain.entity.SysRole;
-import cn.com.wingxi.biandan.common.core.domain.entity.SysUser;
-import cn.com.wingxi.biandan.system.merchant.domain.Merchant;
-import cn.com.wingxi.biandan.system.merchant.service.IMerchantService;
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrder;
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrderDetail;
-import cn.com.wingxi.biandan.system.order.domain.Order;
-import cn.com.wingxi.biandan.system.order.domain.OrderDetail;
-import cn.com.wingxi.biandan.system.order.service.ICommissionOrderDetailService;
-import cn.com.wingxi.biandan.system.order.service.ICommissionOrderService;
-import cn.com.wingxi.biandan.system.order.service.IOrderDetailService;
-import cn.com.wingxi.biandan.system.order.service.IOrderService;
-import cn.com.wingxi.biandan.system.system.service.ISysRoleService;
-import cn.com.wingxi.biandan.system.system.service.ISysUserService;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-
-@Slf4j
-@Component
-public class CommissionOrderPayedConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private IOrderService iOrderService;
-
-    @Resource
-    private IOrderDetailService iOrderDetailService;
-
-    @Resource
-    private ICommissionOrderService iCommissionOrderService;
-
-    @Resource
-    private ICommissionOrderDetailService iCommissionOrderDetailService;
-
-    @Resource
-    private ISysUserService iSysUserService;
-
-    @Resource
-    private ISysRoleService iSysRoleService;
-
-    @Resource
-    private IMerchantService iMerchantService;
-
-    @Resource
-    private ICommissionMoneyDayVoService iCommissionMoneyDayVoService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_COMMISSION_FOR_PAYED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(
-                this.bind(OrderMqKey.EDIT_EXCHANGE,
-                        OrderMqKey.EDIT_QUEUE_COMMISSION_FOR_PAYED,
-                        OrderMqKey.EDIT_ROUTE_FOR_PAYED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_COMMISSION_FOR_PAYED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("推广者佣金订单创建MQ,处理推送的订单数据【{}】.", body);
-
-        Date nowDate = DateUtils.getNowDate();
-
-        OrderBO orderBO = JSON.parseObject(body, OrderBO.class);
-        Long orderId = orderBO.getOrderId();
-
-        Order order = iOrderService.selectOrderByOrderId(orderId);
-        if (order == null) {
-            log.info("推广者佣金订单创建MQ,订单【{}】信息未查询到，不处理.", orderBO.getOrderNo());
-            return true;
-        }
-
-        if (order.getReferrerId() == null || order.getReferrerId() == 0L) {
-            log.info("推广者佣金订单创建MQ,订单【{}】的推广者为空不处理.", order.getOrderNo());
-            return true;
-        }
-        // 推广费率
-        BigDecimal referrerRate = order.getReferrerRate();
-        if(referrerRate == null || BigDecimal.ZERO.compareTo(referrerRate) >= 0) {
-            Merchant sellerMerc = iMerchantService.selectMerchantByMercId(order.getSellerId());
-            if(sellerMerc == null) {
-                log.info("推广者佣金订单创建MQ,订单【{}】的销方商户信息未查询到，不处理.", orderBO.getOrderNo());
-                return true;
-            }
-            referrerRate = sellerMerc.getReferrerRate();
-        }
-        CommissionOrder r = new CommissionOrder();
-        r.setOrderId(orderId);
-        List<CommissionOrder> commissionOrders = iCommissionOrderService.selectCommissionOrderList(r);
-
-        if (commissionOrders != null && !commissionOrders.isEmpty()) {
-            log.info("推广者佣金订单创建MQ,推广者佣金订单【{}】已经存在.", order.getOrderNo());
-            return true;
-        }
-
-        // 查询推广者
-        SysUser referrer = iSysUserService.selectUserById(order.getReferrerId());
-        if (referrer == null) {
-            log.info("推广者佣金订单创建MQ,订单【{}】的推广者【ID:{}】信息不存在不处理", order.getOrderNo(), order.getReferrerId());
-            return true;
-        }
-        // 推广者角色
-        if(StringUtils.isEmpty(order.getReferrerRole()) && StringUtils.isNotNull(referrer.getReferrerId()) && referrer.getReferrerId() != 0L) {
-            SysRole referrerRole = iSysRoleService.selectRoleById(referrer.getRoleId());
-            if(referrerRole != null) {
-                order.setReferrerRole(referrerRole.getRoleKey());
-            }
-        }
-
-        // 订单明细
-        OrderDetail sod = new OrderDetail();
-        sod.setOrderId(orderId);
-        List<OrderDetail> orderDetails = iOrderDetailService.selectOrderDetailList(sod);
-
-        if (!orderDetails.isEmpty()) {
-            // 推广者佣金订单
-            CommissionOrder nco = buildCommissionOrder(order);
-            nco.setReferrerStoreID(referrer.getBelongId());
-            nco.setReferrerAccount(referrer.getWxOpenId());
-
-            BigDecimal commissionAmount = BigDecimal.ZERO;
-            BigDecimal orderAmount = BigDecimal.ZERO;
-            for (OrderDetail orderDetail : orderDetails) {
-
-                CommissionOrderDetail ncod = buildCommissionOrderDetail(nco, orderDetail);
-                ncod.setCommissionRate(referrerRate);
-                ncod.setCommissionAmount(CommissionUtils.calcCommission(ncod));
-                iCommissionOrderDetailService.insertCommissionOrderDetail(ncod);
-
-                // 是否分账推广分佣或者推荐提成
-                if (CommissionUtils.isShareProfit(nco)) {
-                    commissionAmount = commissionAmount.add(ncod.getCommissionAmount());
-                    orderAmount = orderAmount.add(CommissionUtils.calcOrderAmount(ncod));
-                }
-            }
-            nco.setTotalAmount(commissionAmount);
-            nco.setOrderAmount(orderAmount);
-            iCommissionOrderService.insertCommissionOrder(nco);
-
-            // 是否分账推广分佣或者推荐提成
-            if (CommissionUtils.isShareProfit(nco)) {
-                // 更新日月报表
-                iCommissionMoneyDayVoService.recordCommissionMoney(nco);
-            }
-        }
-
-        log.info("推广者佣金订单创建MQ,订单【{}】数据处理完成.", order.getOrderNo());
-        return true;
-    }
-
-    private CommissionOrder buildCommissionOrder(Order order) {
-
-        CommissionOrder nco = new CommissionOrder();
-        nco.setOrderId(order.getOrderId());
-        nco.setOrderNo(order.getOrderNo());
-        nco.setOrderTime(order.getOrderTime());
-        nco.setReferrerId(order.getReferrerId());
-        nco.setReferrerRole(order.getReferrerRole());
-        nco.setBuyerId(order.getBuyerId());
-        nco.setBuyerRole(order.getBuyerRole());
-        nco.setSellerId(order.getSellerId());
-        nco.setSellerRole(order.getSellerRole());
-        nco.setOrderAmount(BigDecimal.ZERO);
-        nco.setTotalAmount(BigDecimal.ZERO);
-        nco.setBusinessCategory("R");
-        nco.setOrderStatus(order.getOrderStatus());
-        nco.setDelFlag("0");
-        nco.setCreateUser("推广者佣金订单创建mq");
-        nco.setCreateTime(order.getOrderTime());
-        nco.setUpdateUser("推广者佣金订单创建mq");
-        nco.setUpdateTime(order.getOrderTime());
-        return nco;
-    }
-
-    private CommissionOrderDetail buildCommissionOrderDetail(CommissionOrder order, OrderDetail orderDetail) {
-        CommissionOrderDetail ncod = new CommissionOrderDetail();
-        ncod.setOrderId(order.getOrderId());
-        ncod.setOrderNo(order.getOrderNo());
-        ncod.setOrderDetailId(orderDetail.getOrderDetailId());
-        ncod.setBuyerId(order.getBuyerId());
-        ncod.setBuyerRole(order.getBuyerRole());
-        ncod.setSellerId(order.getSellerId());
-        ncod.setSellerRole(order.getSellerRole());
-        ncod.setSuiteId(orderDetail.getSuiteId());
-        ncod.setProdId(orderDetail.getProdId());
-        ncod.setProdName(orderDetail.getProdName());
-        ncod.setPprId(orderDetail.getPprId());
-        ncod.setPprName(orderDetail.getPprName());
-        ncod.setProdType(orderDetail.getProdType());
-        ncod.setOrderQty(orderDetail.getBuyQty());
-        ncod.setPrice(orderDetail.getBuyPrice());
-        ncod.setReturnQty(0);
-        ncod.setOrderDetailStatus(orderDetail.getOrderDetailStatus());
-        ncod.setDelFlag(EDelete.FALSE.getVal());
-        ncod.setCreateUser(order.getCreateUser());
-        ncod.setCreateTime(order.getCreateTime());
-        ncod.setUpdateUser(order.getUpdateUser());
-        ncod.setUpdateTime(order.getUpdateTime());
-        return ncod;
-    }
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/commission/CommissionOrderReturnedConsumer.java

@@ -1,157 +0,0 @@
-package com.xingxi.mq.consumer.commission;
-
-import cn.com.wingxi.biandan.common.enums.EDelete;
-import cn.com.wingxi.biandan.common.mq.bo.order.OrderReturnedBO;
-import cn.com.wingxi.biandan.common.mq.constant.OrderMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import com.xingxi.mq.server.order.service.ICommissionOrderDetailVoService;
-import com.xingxi.mq.server.order.service.ICommissionOrderVoService;
-import com.xingxi.mq.server.report.service.ICommissionMoneyDayVoService;
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrder;
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrderDetail;
-import cn.com.wingxi.biandan.system.order.service.ICommissionOrderDetailService;
-import cn.com.wingxi.biandan.system.order.service.ICommissionOrderService;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-
-@Slf4j
-@Component
-public class CommissionOrderReturnedConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private ICommissionOrderService iCommissionOrderService;
-
-    @Resource
-    private ICommissionOrderVoService iCommissionOrderVoService;
-
-    @Resource
-    private ICommissionOrderDetailService iCommissionOrderDetailService;
-
-    @Resource
-    private ICommissionOrderDetailVoService iCommissionOrderDetailVoService;
-
-    @Resource
-    private ICommissionMoneyDayVoService iCommissionMoneyDayVoService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_COMMISSION_FOR_RETURNED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_COMMISSION_FOR_RETURNED,
-                OrderMqKey.EDIT_ROUTE_FOR_RETURNED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_COMMISSION_FOR_RETURNED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("推广者佣金订单退货MQ, 处理推送的订单数据【{}】.", body);
-        Date nowDate = DateUtils.getNowDate();
-
-        List<OrderReturnedBO> returnList = JSON.parseArray(body, OrderReturnedBO.class);
-
-        CommissionOrderDetail scod = new CommissionOrderDetail();
-        for (OrderReturnedBO orbo : returnList) {
-            int returnQty = 0;
-            if(orbo.getStockQty() != null) {
-                returnQty = orbo.getStockQty();
-            }
-            if(orbo.getScrapQty() != null) {
-                returnQty = returnQty + orbo.getScrapQty();
-            }
-            if(returnQty <= 0) {
-                continue;
-            }
-
-            scod.setOrderId(orbo.getOrderId());
-            scod.setOrderDetailId(orbo.getOrderDetailId());
-            scod.setSuiteId(orbo.getSuiteId());
-            List<CommissionOrderDetail> cods = iCommissionOrderDetailService.selectCommissionOrderDetailList(scod);
-            if(CollectionUtils.isEmpty(cods)) {
-                continue;
-            }
-            scod = cods.get(0);
-
-            CommissionOrder sco = new CommissionOrder();
-            sco.setOrderId(scod.getOrderId());
-            sco.setBuyerId(scod.getBuyerId());
-            sco.setSellerId(scod.getSellerId());
-            sco.setDelFlag(EDelete.FALSE.getVal());
-            List<CommissionOrder> cos = iCommissionOrderService.selectCommissionOrderList(sco);
-            if(CollectionUtils.isEmpty(cos)) {
-                continue;
-            }
-            sco = cos.get(0);
-
-            BigDecimal changeOrderAmountTotal = BigDecimal.ZERO;
-            BigDecimal changeCommissionAmountTotal = BigDecimal.ZERO;
-
-            for (CommissionOrderDetail cod : cods) {
-
-                CommissionOrderDetail ucod = new CommissionOrderDetail();
-                ucod.setId(cod.getId());
-                // 旧的
-                BigDecimal oldOrderAmount = CommissionUtils.calcOrderAmount(cod);
-                BigDecimal oldCommissionAmount = cod.getCommissionAmount();
-
-                // 计算单笔退货之后剩余的佣金
-                cod.setReturnQty(cod.getReturnQty() + returnQty);
-
-                // 新的
-                BigDecimal newOrderAmount = CommissionUtils.calcOrderAmount(cod);
-                BigDecimal newCommissionAmount = CommissionUtils.calcCommission(cod);
-
-                // 变化
-                BigDecimal changeOrderAmount = oldOrderAmount.subtract(newOrderAmount);
-                BigDecimal changeCommissionAmount = oldCommissionAmount.subtract(newCommissionAmount);
-
-                // 变化汇总
-                changeOrderAmountTotal = changeOrderAmountTotal.add(changeOrderAmount);
-                changeCommissionAmountTotal = changeCommissionAmountTotal.add(changeCommissionAmount);
-
-                ucod.setCommissionAmount(changeCommissionAmount);
-                ucod.setReturnQty(returnQty);
-                ucod.setUpdateUser("推广者佣金订单退货mq");
-                ucod.setUpdateTime(nowDate);
-                iCommissionOrderDetailVoService.updateCommissionOrderDetailVo(ucod);
-            }
-
-            if(CommissionUtils.isShareProfit(sco)) {
-                sco.setOrderAmount(changeOrderAmountTotal);
-                sco.setTotalAmount(changeCommissionAmountTotal);
-                sco.setUpdateUser("推广者佣金订单退货mq");
-                sco.setUpdateTime(nowDate);
-                iCommissionOrderVoService.updateCommissionOrderVo(sco);
-
-                // 更新日月报表
-                sco.setOrderAmount(changeOrderAmountTotal.multiply(new BigDecimal("-1")));
-                sco.setTotalAmount(changeCommissionAmountTotal.multiply(new BigDecimal("-1")));
-                iCommissionMoneyDayVoService.recordCommissionMoney(sco);
-            }
-        }
-
-        log.info("推广者佣金订单退货MQ,订单数据处理完成.");
-        return true;
-    }
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/commission/CommissionUtils.java

@@ -1,53 +0,0 @@
-package com.xingxi.mq.consumer.commission;
-
-import cn.com.wingxi.biandan.common.enums.ERoleKey;
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrder;
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrderDetail;
-
-import java.math.BigDecimal;
-
-public class CommissionUtils {
-
-    // 计算订单金额
-    public static BigDecimal calcOrderAmount(CommissionOrderDetail cod){
-        // 佣金=(单价*（订单数量-退货数量）-抵扣金额)*推广者分佣比率
-        // 订单数量-退货数量
-        int qty = cod.getOrderQty() - cod.getReturnQty();
-        // 单价 *（订单数量-退货数量）
-        BigDecimal totalAmount = cod.getPrice().multiply(new BigDecimal(qty + ""));
-
-        if (totalAmount.compareTo(BigDecimal.ZERO) >= 0) {
-            return totalAmount;
-        }
-        return BigDecimal.ZERO;
-    }
-
-    // 计算佣金
-    public static BigDecimal calcCommission(CommissionOrderDetail cod){
-
-        // 佣金=(单价*（订单数量-退货数量）-抵扣金额)*推广者分佣比率
-        // 订单数量-退货数量
-        int qty = cod.getOrderQty() - cod.getReturnQty();
-        // 单价 *（订单数量-退货数量）
-        BigDecimal totalAmount = cod.getPrice().multiply(new BigDecimal(qty + ""));
-
-        if (totalAmount.compareTo(BigDecimal.ZERO) > 0) {
-            // (单价*（订单数量-退货数量）-抵扣金额)*推广者分佣比率
-            BigDecimal commissionAmount = totalAmount.multiply(cod.getCommissionRate() == null ? BigDecimal.ZERO : cod.getCommissionRate());
-            // 精度到分
-            return commissionAmount.setScale(0, BigDecimal.ROUND_HALF_UP);
-        }
-        return BigDecimal.ZERO;
-    }
-
-    /**
-     * 是否分账推广分佣
-     */
-    public static boolean isShareProfit(CommissionOrder co) {
-
-        if(ERoleKey.CUSTOMER.getCode().equals(co.getReferrerRole())) {
-            return true;
-        }
-        return false;
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/invoice/InvoiceApplyShdzfpConsumer.java

@@ -1,268 +0,0 @@
-package com.xingxi.mq.consumer.invoice;
-
-import cn.com.wingxi.biandan.common.enums.EInvoiceStatus;
-import cn.com.wingxi.biandan.common.mq.bo.invoice.InvoiceBO;
-import cn.com.wingxi.biandan.common.mq.constant.InvoiceMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import cn.com.wingxi.biandan.common.utils.RMBUtil;
-import cn.com.wingxi.biandan.common.utils.StringUtils;
-import com.xingxi.mq.server.master.service.ICompanyMqService;
-import com.xingxi.mq.server.shdzfp.InvoiceField;
-import com.xingxi.mq.server.shdzfp.client.InvoiceClient;
-import com.xingxi.mq.server.shdzfp.payload.FpKjXxRequest;
-import com.xingxi.mq.server.shdzfp.payload.FpKjXxResponse;
-import cn.com.wingxi.biandan.system.customer.domain.UserApplyInvoiceInfo;
-import cn.com.wingxi.biandan.system.customer.service.IUserApplyInvoiceInfoService;
-import cn.com.wingxi.biandan.system.master.domain.Company;
-import cn.com.wingxi.biandan.system.order.domain.Invoice;
-import cn.com.wingxi.biandan.system.order.domain.InvoiceDetail;
-import cn.com.wingxi.biandan.system.order.service.IInvoiceDetailService;
-import cn.com.wingxi.biandan.system.order.service.IInvoiceService;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-import sajt.shdzfp.bean.FPKJXX_DDXX;
-import sajt.shdzfp.bean.FPKJXX_FPTXX;
-import sajt.shdzfp.bean.FPKJXX_XMXX;
-
-import java.lang.reflect.Field;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @ClassName InvoiceApplyShdzfpConsumer
- * @projectName biandan
- * @Deacription // TODO
- * @Author FZ.Dong
- * @Date 2022/11/4 13:43
- * @Version 1.0
- **/
-
-@Slf4j
-@Component
-public class InvoiceApplyShdzfpConsumer extends AbstractRabbitConsumer {
-
-    @Autowired
-    private InvoiceClient invoiceClient;
-
-    @Autowired
-    private ICompanyMqService iCompanyMqService;
-
-    @Autowired
-    private IUserApplyInvoiceInfoService iUserApplyInvoiceInfoService;
-
-    @Autowired
-    private IInvoiceService iInvoiceService;
-
-    @Autowired
-    private IInvoiceDetailService iInvoiceDetailService;
-
-    @Bean(InvoiceMqKey.EDIT_QUEUE_INVOICE_FOR_APPLY_SHDZFP)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(
-                InvoiceMqKey.EDIT_EXCHANGE,
-                InvoiceMqKey.EDIT_QUEUE_INVOICE_FOR_APPLY_SHDZFP,
-                InvoiceMqKey.EDIT_ROUTE_INVOICE_FOR_APPLY
-        ));
-    }
-
-    @RabbitListener(queues = InvoiceMqKey.EDIT_QUEUE_INVOICE_FOR_APPLY_SHDZFP)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("上海电子发票开具mq消息处理={}", body);
-        InvoiceBO invoiceBO = JSON.parseObject(body, InvoiceBO.class);
-
-        // 发票信息
-        Invoice invoice = iInvoiceService.selectInvoiceById(invoiceBO.getId());
-
-        // 开票中或者已开票则跳过
-        if(EInvoiceStatus.BILLING.getVal().equals(invoice.getInvoiceStatus())
-                || EInvoiceStatus.BILLED.getVal().equals(invoice.getInvoiceStatus())) {
-            return true;
-        }
-
-        Company company = iCompanyMqService.selectCompanyByCompanyCode(invoice.getNsrsbh());
-        if(company == null) {
-            log.info("上海电子发票开具mq消息处理:【{}】公司信息不存在.", invoice.getNsrsbh());
-            return true;
-        }
-
-        // 销方的开户行及账号需要拼接起来
-        String xhfyhzh = "";
-        if(StringUtils.isNotEmpty(invoice.getXhfYh())) {
-            xhfyhzh = invoice.getXhfYh();
-        }
-        if(StringUtils.isNotEmpty(invoice.getXhfYhzh())) {
-            xhfyhzh = xhfyhzh + invoice.getXhfYhzh();
-        }
-        invoice.setXhfYhzh(xhfyhzh);
-
-        // 购方的开户行及账号需要拼接起来
-        String ghfyhzh = "";
-        if(StringUtils.isNotEmpty(invoice.getGhfYh())) {
-            ghfyhzh = invoice.getGhfYh();
-        }
-        if(StringUtils.isNotEmpty(invoice.getGhfYhzh())) {
-            ghfyhzh = ghfyhzh + invoice.getGhfYhzh();
-        }
-        invoice.setGhfYhzh(ghfyhzh);
-
-        InvoiceDetail sid = new InvoiceDetail();
-        sid.setInvoiceId(invoice.getId());
-        List<InvoiceDetail> invoiceDetails = iInvoiceDetailService.selectInvoiceDetailList(sid);
-
-        FpKjXxRequest request = buildFpKjXxRequest(invoice, invoiceDetails);
-        request.setAuthCode(company.getAuthCode());
-        request.setRegistrationCode(company.getRegistrationCode());
-        request.setPtdj3desKey(company.getPtdj3desKey());
-
-        try {
-            FpKjXxResponse response = invoiceClient.getResponse(request);
-            if (response != null && response.getReturnStateInfo() != null){
-                log.info("开票返回信息：发票流水号【{}】，返回代码【{}】，返回描述【{}】.",
-                        invoice.getFpqqlsh(),
-                        response.getReturnStateInfo() != null ? response.getReturnStateInfo().getReturnCode() : "null",
-                        response.getMessage());
-                updateInvoice(invoice, response);
-                if ("0000".equals(response.getReturnStateInfo().getReturnCode())) {
-                    // B2C更新
-                    if (invoice.getApplyId() != null) {
-                        updateUserApplyInvoiceInfo(invoice);
-                    }
-                }
-                return true;
-            }
-            return false;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    private FpKjXxRequest buildFpKjXxRequest(Invoice invoice, List<InvoiceDetail> invoiceDetails){
-        FpKjXxRequest request = new FpKjXxRequest();
-        request.setDsptbm(invoice.getDsptbm());
-        request.setTaxpayerId(invoice.getNsrsbh());
-        FPKJXX_FPTXX fpkjxxFptxx = new FPKJXX_FPTXX();
-        copy(invoice, fpkjxxFptxx);
-        fpkjxxFptxx.setUSERID(null);
-        FPKJXX_DDXX fpkjxxDdxx  = new FPKJXX_DDXX();
-        copy(invoice, fpkjxxDdxx);
-
-        List<FPKJXX_XMXX> xmxxList = new ArrayList<>();
-        int index = 0;
-        for (InvoiceDetail invoiceDetail : invoiceDetails) {
-
-            if(invoiceDetail.getXmje().compareTo(BigDecimal.ZERO) <= 0) {
-                // 2：被折扣行
-                invoiceDetail.setFphxz("2");
-                invoiceDetail.setXmje(invoiceDetail.getOrgAmount());
-                FPKJXX_XMXX fpkjxxxmxx2 = new FPKJXX_XMXX();
-                copy(invoiceDetail, fpkjxxxmxx2);
-                xmxxList.add(fpkjxxxmxx2);
-
-                // 1：折扣行
-                invoiceDetail.setXmsl(null);
-                invoiceDetail.setFphxz("1");
-                invoiceDetail.setXmje(BigDecimal.ZERO.subtract(invoiceDetail.getOrgAmount()));
-                FPKJXX_XMXX fpkjxxxmxx1 = new FPKJXX_XMXX();
-                copy(invoiceDetail, fpkjxxxmxx1);
-                xmxxList.add(fpkjxxxmxx1);
-
-            } else {
-                FPKJXX_XMXX fpkjxxxmxx = new FPKJXX_XMXX();
-                copy(invoiceDetail, fpkjxxxmxx);
-                xmxxList.add(fpkjxxxmxx);
-            }
-        }
-
-        FPKJXX_XMXX[] fpkjxxXmxxs = new FPKJXX_XMXX[xmxxList.size()];
-        for(int i = 0; i < xmxxList.size(); i++) {
-            fpkjxxXmxxs[i] = xmxxList.get(i);
-        }
-        request.setFPKJXX_FPTXX(fpkjxxFptxx);
-        request.setFPKJXX_XMXXS(fpkjxxXmxxs);
-        request.setFPKJXX_DDXX(fpkjxxDdxx);
-        return request;
-    }
-
-
-    private <I, O> void copy(I in, O out){
-        Field[] inFields = in.getClass().getDeclaredFields();
-        Field[] outFields = out.getClass().getDeclaredFields();
-        for (Field inField : inFields) {
-            for (Field outField : outFields) {
-                InvoiceField invField = inField.getDeclaredAnnotation(InvoiceField.class);
-                if (inField.getName().equalsIgnoreCase(outField.getName()) ||
-                        (invField != null && invField.name().equalsIgnoreCase(outField.getName()))) {
-                    try {
-                        inField.setAccessible(true);
-                        outField.setAccessible(true);
-                        Object inValue = inField.get(in);
-                        Object outValue = outField.get(out);
-                        if (inValue != null && outValue == null) {
-                            if (inValue instanceof BigDecimal) {
-                                BigDecimal temp = (BigDecimal) inValue;
-                                outField.set(out, RMBUtil.fenToYuan(temp).toPlainString());
-                            } else if(inValue instanceof Integer) {
-                                outField.set(out, inValue + "");
-                            } else if(inValue instanceof Long) {
-                                outField.set(out, inValue + "");
-                            } else if(inValue instanceof Date) {
-                                Date tmp = (Date)inValue;
-                                outField.set(out, DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, tmp));
-                            } else {
-                                outField.set(out, inValue);
-                            }
-                        }
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }
-    }
-
-
-    private void updateInvoice(Invoice invoice, FpKjXxResponse response){
-        Invoice ui = new Invoice();
-        ui.setId(invoice.getId());
-        if ("0000".equals(response.getReturnStateInfo().getReturnCode())) {
-            ui.setInvoiceStatus(EInvoiceStatus.BILLING.getVal());
-            ui.setKprq(new Date());
-        }
-        ui.setReturnCode(response.getReturnStateInfo().getReturnCode());
-        ui.setReturnMessage(response.getMessage());
-        ui.setUpdateTime(new Date());
-        ui.setUpdateUser("开票mq");
-        iInvoiceService.updateInvoice(ui);
-    }
-
-
-    private void updateUserApplyInvoiceInfo(Invoice invoice){
-        UserApplyInvoiceInfo uuaii = new UserApplyInvoiceInfo();
-        uuaii.setId(invoice.getApplyId());
-        uuaii.setApplyNo(invoice.getApplyNo());
-        uuaii.setApplyStatus(EInvoiceStatus.BILLING.getVal());
-        uuaii.setUpdateTime(new Date());
-        uuaii.setUpdateUser("开票mq");
-        iUserApplyInvoiceInfoService.updateUserApplyInvoiceInfo(uuaii);
-    }
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/invoice/InvoiceOrderCanceledConsumer.java

@@ -1,87 +0,0 @@
-package com.xingxi.mq.consumer.invoice;
-
-import cn.com.wingxi.biandan.common.enums.EOrderStatus;
-import cn.com.wingxi.biandan.common.mq.bo.order.OrderCanceledBO;
-import cn.com.wingxi.biandan.common.mq.constant.OrderMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import cn.com.wingxi.biandan.system.order.domain.InvoiceOrder;
-import cn.com.wingxi.biandan.system.order.service.IInvoiceOrderService;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @ClassName InvoiceOrderCanceledMqConsumer
- * @projectName hocy
- * @Deacription 订单取消消息接受处理
- * @Author FZ.Dong
- * @Date 2022/3/15 16:56
- * @Version 1.0
- **/
-@Slf4j
-@Component
-public class InvoiceOrderCanceledConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private IInvoiceOrderService iInvoiceOrderService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_INVOICE_FOR_CANCELED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_INVOICE_FOR_CANCELED,
-                OrderMqKey.EDIT_ROUTE_FOR_CANCELED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_INVOICE_FOR_CANCELED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("开票订单取消MQ： 处理推送的订单数据【{}】", body);
-        Date nowDate = DateUtils.getNowDate();
-
-        // json对象转换
-        List<OrderCanceledBO> canceledBos = JSON.parseArray(body, OrderCanceledBO.class);
-
-        for (OrderCanceledBO ocbo : canceledBos) {
-            InvoiceOrder sio = new InvoiceOrder();
-            // 设置订单编号
-            sio.setOrderId(ocbo.getOrderId());
-            sio.setOrderDetailId(ocbo.getOrderDetailId());
-            sio.setSuiteId(ocbo.getSuiteId());
-            // 发票订单数据取得
-            List<InvoiceOrder> orderList = iInvoiceOrderService.selectInvoiceOrderList(sio);
-            for(InvoiceOrder io : orderList) {
-                InvoiceOrder uio = new InvoiceOrder();
-                uio.setId(io.getId());
-                // 设置退货数量等于订单数量
-                uio.setReturnQty(io.getOrderQty());
-                // 取消状态
-                uio.setOrderStatus(EOrderStatus.CANCELLED.getVal());
-                // 设置更新用户
-                uio.setUpdateUser("开票订单取消MQ");
-                // 设置更新时间
-                uio.setUpdateTime(nowDate);
-                iInvoiceOrderService.updateInvoiceOrder(uio);
-            }
-        }
-
-        log.info("开票订单取消MQ： 推送的订单数据处理完成.");
-        return true;
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/invoice/InvoiceOrderFinishedConsumer.java

@@ -1,92 +0,0 @@
-package com.xingxi.mq.consumer.invoice;
-
-import cn.com.wingxi.biandan.common.enums.EOrderStatus;
-import cn.com.wingxi.biandan.common.mq.bo.order.OrderFinishedBO;
-import cn.com.wingxi.biandan.common.mq.constant.OrderMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import cn.com.wingxi.biandan.system.order.domain.InvoiceOrder;
-import cn.com.wingxi.biandan.system.order.service.IInvoiceOrderService;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @ClassName InvoiceOrderFinishedConsumer
- * @projectName hocy
- * @Deacription 订单完成消息接受处理
- * @Author FZ.Dong
- * @Date 2022/3/15 16:56
- * @Version 1.0
- **/
-@Slf4j
-@Component
-public class InvoiceOrderFinishedConsumer extends AbstractRabbitConsumer
-{
-    @Resource
-    private IInvoiceOrderService iInvoiceOrderService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_INVOICE_FOR_FINISHED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_INVOICE_FOR_FINISHED,
-                OrderMqKey.EDIT_ROUTE_FOR_FINISHED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_INVOICE_FOR_FINISHED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("发票订单完成MQ： 处理推送的订单数据【{}】", body);
-
-        Date nowDate = DateUtils.getNowDate();
-
-        // json对象转换
-        OrderFinishedBO orderFinishedBO = JSON.parseObject(body, OrderFinishedBO.class);
-
-        // 订单明细
-        InvoiceOrder scod = new InvoiceOrder();
-        // 设置订单编号
-        scod.setOrderId(orderFinishedBO.getOrderId());
-        scod.setOrderDetailId(orderFinishedBO.getOrderDetailId());
-        scod.setSuiteId(orderFinishedBO.getSuiteId());
-        // 订单明细数据取得
-        List<InvoiceOrder> detailList = iInvoiceOrderService.selectInvoiceOrderList(scod);
-
-        if(CollectionUtils.isEmpty(detailList)){
-            log.info("发票订单完成MQ： 订单【{}】明细表不存在，不做处理.", orderFinishedBO.getOrderId());
-            return true;
-        }
-        for(InvoiceOrder io : detailList) {
-            InvoiceOrder uio = new InvoiceOrder();
-            uio.setId(io.getId());
-            // 完成状态
-            uio.setOrderStatus(EOrderStatus.FINISHED.getVal());
-            // 完成时间
-            uio.setFinishTime(nowDate);
-            // 设置更新用户
-            uio.setUpdateUser("发票订单完成MQ");
-            // 设置更新时间
-            uio.setUpdateTime(nowDate);
-            iInvoiceOrderService.updateInvoiceOrder(uio);
-        }
-        log.info("发票订单完成MQ： 推送的订单数据处理完成.");
-        return true;
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/invoice/InvoiceOrderPayedConsumer.java

@@ -1,549 +0,0 @@
-package com.xingxi.mq.consumer.invoice;
-
-import cn.com.wingxi.biandan.common.enums.*;
-import cn.com.wingxi.biandan.common.mq.bo.order.OrderBO;
-import cn.com.wingxi.biandan.common.mq.constant.OrderMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import cn.com.wingxi.biandan.common.utils.bean.BeanUtils;
-import com.xingxi.mq.server.material.domain.MaterialKindMq;
-import com.xingxi.mq.server.material.service.IMatePriceMqService;
-import com.xingxi.mq.server.material.service.IMaterialKindMqService;
-import com.xingxi.mq.server.product.domain.ProdMateMq;
-import com.xingxi.mq.server.product.service.IProdMateMqService;
-import com.xingxi.mq.server.product.service.IProdPriceMqService;
-import com.xingxi.mq.server.system.service.ISysDeptVoService;
-import cn.com.wingxi.biandan.common.core.domain.entity.SysDept;
-import cn.com.wingxi.biandan.system.material.domain.MatePrice;
-import cn.com.wingxi.biandan.system.order.domain.InvoiceOrder;
-import cn.com.wingxi.biandan.system.order.domain.Order;
-import cn.com.wingxi.biandan.system.order.domain.OrderDetail;
-import cn.com.wingxi.biandan.system.order.service.IInvoiceOrderService;
-import cn.com.wingxi.biandan.system.order.service.IOrderDetailService;
-import cn.com.wingxi.biandan.system.order.service.IOrderService;
-import cn.com.wingxi.biandan.system.product.domain.Prod;
-import cn.com.wingxi.biandan.system.product.domain.ProdPrice;
-import cn.com.wingxi.biandan.system.product.service.IProdService;
-import cn.com.wingxi.biandan.system.system.service.ISysDeptService;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @ClassName InvoiceOrderPayedMqConsumer
- * @projectName hocy
- * @Deacription 发票基础订单数据
- * @Author gao
- * @Date 2022/3/15 16:56
- * @Version 1.0
- **/
-
-
-@Slf4j
-@Component
-public class InvoiceOrderPayedConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private ISysDeptService iSysDeptService;
-
-    @Resource
-    private ISysDeptVoService iSysDeptVoService;
-
-    @Resource
-    private IOrderService iOrderService;
-
-    @Resource
-    private IOrderDetailService iOrderDetailService;
-
-    @Resource
-    private IInvoiceOrderService iInvoiceOrderService;
-
-    @Resource
-    private IProdService iProdService;
-
-    @Resource
-    private IMaterialKindMqService iMaterialKindMqService;
-
-    @Resource
-    private IProdMateMqService iProdMateMqService;
-
-    @Resource
-    private IProdPriceMqService iProdPriceMqService;
-
-    @Resource
-    private IMatePriceMqService iMatePriceMqService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_INVOICE_FOR_PAYED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(
-                OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_INVOICE_FOR_PAYED,
-                OrderMqKey.EDIT_ROUTE_FOR_PAYED
-        ));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_INVOICE_FOR_PAYED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("发票订单创建MQ,处理推送的订单数据【{}】.", body);
-
-        // 消息唯一id
-        String messageId = message.getMessageProperties().getMessageId();
-
-        // json对象转换
-        OrderBO orderBo = JSON.parseObject(body, OrderBO.class);
-
-        // 通过订单id查询是否存在
-        InvoiceOrder sio = new InvoiceOrder();
-        sio.setOrderId(orderBo.getOrderId());
-        sio.setDelFlag(EDelete.FALSE.getVal());
-        List<InvoiceOrder> exists = iInvoiceOrderService.selectInvoiceOrderList(sio);
-        // ack
-        if (CollectionUtils.isNotEmpty(exists)) {
-            log.info("发票订单创建MQ,订单【{}】数据已存在.", orderBo.getOrderNo());
-            // 处理成功
-            return true;
-        } else {
-            // 原始订单信息
-            Order orgOrder = iOrderService.selectOrderByOrderId(orderBo.getOrderId());
-
-            OrderDetail sod = new OrderDetail();
-            sod.setOrderId(orderBo.getOrderId());
-            List<OrderDetail> orderDetailList = iOrderDetailService.selectOrderDetailList(sod);
-
-            // M2C
-            buildM2CInvoiceOrder(orgOrder, orderDetailList);
-
-            // M2M
-            buildM2MInvoiceOrder(orgOrder, orderDetailList, orgOrder.getSellerId(), orgOrder.getSellerRole());
-
-            // 供应商
-            buildV2PInvoiceOrder(orgOrder, orderDetailList);
-            log.info("发票订单创建MQ,订单【{}】数据处理完成.", orderBo.getOrderNo());
-            // 处理成功
-            return true;
-        }
-    }
-
-    /**
-     * 构建M2C清算数据, C端与商户
-     *
-     * @param order
-     */
-    public void buildM2CInvoiceOrder(Order order, List<OrderDetail> orderDetailList) {
-
-        String opName = "发票订单创建MQ";
-        Date nowDate = DateUtils.getNowDate();
-
-        // 循环处理子订单
-        for (OrderDetail od : orderDetailList) {
-            InvoiceOrder nio = new InvoiceOrder();
-            nio.setOrderId(order.getOrderId());       // 订单ID
-            nio.setOrderNo(order.getOrderNo());      // 订单号
-            nio.setOrderDetailId(od.getOrderDetailId());// 订单明细ID
-            nio.setBuyerId(order.getBuyerId());      // 购方ID
-            nio.setBuyerRole(order.getBuyerRole());  // 购方角色
-            nio.setTradeType(ETradeType.M2C.getVal());  // 交易区分
-            nio.setSellerId(order.getSellerId());    // 销方ID
-            nio.setSellerRole(order.getSellerRole());// 销方角色
-            nio.setPayeeId(order.getPayeeId());// 收款方ID
-            nio.setPayeeRole(order.getPayeeRole());// 收款方角色
-            nio.setSuiteId(od.getSuiteId());
-            nio.setProdId(od.getProdId());         // 商品ID
-            nio.setProdName(od.getProdName());     // 商品名
-            nio.setPprId(od.getPprId());           // 商品属性组合ID
-            nio.setPprName(od.getPprName());       // 商品属性组合名
-            nio.setOrgProdId(od.getOrgProdId());   // 元商品ID
-            nio.setMateId(od.getMateId());         // 素材ID
-            nio.setMateName(od.getMateName());     // 素材名称
-            nio.setProdType(od.getProdType());     // 商品区分
-            nio.setPrice(od.getBuyPrice());     // 购方购买单价
-            nio.setSurfaceQty(od.getSurfaceQty());
-            nio.setUnitQty(od.getUnitQty());
-            nio.setOrderQty(od.getBuyQty());       // 订单数量
-            nio.setReturnQty(od.getReturnQty());   // 退货数量
-            nio.setFinishTime(od.getFinishTime()); // 订单完成时间
-            nio.setOrderStatus(od.getOrderDetailStatus());// 订单状态
-//            ncod.setInvoiceTime();// 开票时间
-            nio.setInvoiceStatus(EInvoiceStatus.UNBILLED.getVal());// 开票状态
-//            nio.setInvoiceBatchNo("");// 开票批次号
-//            nio.setInvoiceBillNo("");// 发票请求流水号
-            nio.setDelFlag(EDelete.FALSE.getVal());// 删除标志（0代表存在 2代表删除）
-            nio.setCreateUser(opName);             // 创建用户
-            nio.setCreateTime(nowDate);            // 创建时间
-            nio.setUpdateUser(opName);             // 更新用户
-            nio.setUpdateTime(nowDate);            // 更新时间
-            iInvoiceOrderService.insertInvoiceOrder(nio);
-        }
-    }
-
-    /**
-     * 构建M2M清算数据 商户与上级商户或者平台
-     *
-     * @param order
-     */
-    public void buildM2MInvoiceOrder(Order order, List<OrderDetail> orderDetailList, Long buyerId, String buyerRole) {
-
-        String opName = "发票订单创建MQ";
-        Date nowDate = DateUtils.getNowDate();
-
-        // 销方
-        SysDept sellerDept = iSysDeptVoService.selectParentDeptByDeptId(buyerId);
-        Long sellerId = sellerDept.getDeptId();
-        String sellerRole = sellerDept.getDeptType();
-
-        List<OrderDetail> unpackDetailList = new ArrayList<>();
-
-        for (OrderDetail od : orderDetailList) {
-            if(EDelete.TRUE.getVal().equals(od.getDelFlag())) {
-                // 自营商品在前面舍弃了
-                continue;
-            }
-//            NORMAL("NORMAL", "常规商品"),
-//            CUSTOMIZABLE("CUSTOMIZABLE", "定制商品"),
-//            MATERIAL("MATERIAL", "素材");
-//            FIXED("FIXED", "固化商品"),
-//            HALF_FIXED("HALF_FIXED", "半固化商品"),
-//            MERCPROD("MERC_PRODUCT", "商户商品"),
-//            MERCMATE("MERC_MATERIAL", "商户素材"),
-            if (EProdType.FIXED.getVal().equals(od.getProdType())
-                    || EProdType.HALF_FIXED.getVal().equals(od.getProdType())
-                    || EProdType.MERCPROD.getVal().equals(od.getProdType())) {
-
-                // 商品的归属商户,本商户的固化或者半固化需要拆单，上级商户的则不拆，保留原样
-                Prod prod = iProdService.selectProdByProdId(od.getProdId());
-                if(prod.getMerchantId().longValue() == buyerId.longValue()) {
-                    if (EProdType.FIXED.getVal().equals(od.getProdType())
-                            || EProdType.HALF_FIXED.getVal().equals(od.getProdType())) {
-                        // 商品固化设计面数量
-                        int surfaceQty = iProdMateMqService.selectProdMateSurfaceQty(od.getProdId(), od.getPprId());
-                        Prod orgProd = iProdService.selectProdByProdId(od.getOrgProdId());
-                        OrderDetail nod = new OrderDetail();
-                        BeanUtils.copyBeanProp(nod, od);
-                        nod.setProdId(orgProd.getProdId());//商品更换为元商品
-                        nod.setProdName(orgProd.getProdName());
-                        nod.setProdType(orgProd.getProdType());
-                        nod.setSurfaceQty(surfaceQty + od.getSurfaceQty());
-                        unpackDetailList.add(nod);
-
-                        // 查询所用素材
-                        List<ProdMateMq> prodMateList = iProdMateMqService.selectProdMateUnitQty(od.getProdId(), od.getPprId());
-                        for(ProdMateMq pmm : prodMateList) {
-                            // 素材的归属商户
-                            MaterialKindMq mkm = iMaterialKindMqService.selectMaterialKindMqByMateId(pmm.getMateId());
-                            if(mkm.getMercId().longValue() != buyerId.longValue()) {
-                                OrderDetail nmod = new OrderDetail();
-                                nmod.setOrderDetailId(od.getOrderDetailId());
-                                nmod.setOrderId(od.getOrderId());
-                                nmod.setSuiteId(od.getSuiteId());
-                                nmod.setProdId(orgProd.getProdId());
-                                nmod.setProdName(orgProd.getProdName());
-                                if(EMateBelong.MERC.getVal().equals(mkm.getMateBelong())) {
-                                    nmod.setProdType(EProdType.MERCMATE.getVal());
-                                } else {
-                                    nmod.setProdType(EProdType.MATERIAL.getVal());
-                                }
-                                nmod.setMateId(pmm.getMateId());
-                                nmod.setMateName(pmm.getMateName());
-                                //nmod.setMateType(EMateType);
-                                nmod.setVendorId(mkm.getVendorId());
-                                nmod.setSurfaceQty(0);
-                                nmod.setUnitQty(pmm.getMateQty());
-                                nmod.setBuyQty(od.getBuyQty());
-                                nmod.setAfterQty(od.getAfterQty());
-                                nmod.setReturnQty(od.getReturnQty());
-                                //nmod.setBuyPrice(getMatePrice(order.getBuyerId(), order.getSellerId(), pmm.getMateId()));
-                                nmod.setOrderDetailStatus(od.getOrderDetailStatus());
-                                unpackDetailList.add(nmod);
-                            }
-                        }
-                    } else {
-                        // 自营商品，舍弃
-                        // 借用delFlag，后续供应链不在统计
-                        od.setDelFlag(EDelete.TRUE.getVal());
-                    }
-                } else {
-                    // 非自营，保留
-                    OrderDetail nod = new OrderDetail();
-                    BeanUtils.copyBeanProp(nod, od);
-                    unpackDetailList.add(nod);
-                }
-            }  else if(EProdType.MERCMATE.getVal().equals(od.getProdType())) {
-                // 素材的归属商户
-                MaterialKindMq mkm = iMaterialKindMqService.selectMaterialKindMqByMateId(od.getMateId());
-                if(mkm.getMercId().longValue() != buyerId.longValue()) {
-                    // 非自营，保留
-                    OrderDetail nod = new OrderDetail();
-                    BeanUtils.copyBeanProp(nod, od);
-                    unpackDetailList.add(nod);
-                }
-            } else {
-//            NORMAL("NORMAL", "常规商品"),
-//            CUSTOMIZABLE("CUSTOMIZABLE", "定制商品"),
-//            MATERIAL("MATERIAL", "素材");
-                // 归属平台，保留
-                OrderDetail nod = new OrderDetail();
-                BeanUtils.copyBeanProp(nod, od);
-                unpackDetailList.add(nod);
-            }
-        }
-
-        // 循环处理子订单
-        for (OrderDetail od : unpackDetailList) {
-            // M2P 平台经销商品
-            if(!(EDeptType.PLATFORM.getVal().equals(sellerRole) && EYesNo.YES.getVal().equals(od.getPfSellFlag()))) {
-                continue;
-            }
-            InvoiceOrder nio = new InvoiceOrder();
-            nio.setOrderId(order.getOrderId());       // 订单ID
-            nio.setOrderNo(order.getOrderNo());      // 订单号
-            nio.setOrderDetailId(od.getOrderDetailId());// 订单明细ID
-            nio.setBuyerId(buyerId);      // 购方ID
-            nio.setBuyerRole(buyerRole);  // 购方角色
-            nio.setTradeType(getTradeType(buyerRole, sellerRole).getVal());  // 交易区分
-            nio.setSellerId(sellerId);    // 销方ID
-            nio.setSellerRole(sellerRole);// 销方角色
-            nio.setPayeeId(order.getPayeeId());
-            nio.setPayeeRole(order.getPayeeRole());
-            nio.setSuiteId(od.getSuiteId());
-            nio.setProdId(od.getProdId());         // 商品ID
-            nio.setProdName(od.getProdName());     // 商品名
-            nio.setPprId(od.getPprId());           // 商品属性组合ID
-            nio.setPprName(od.getPprName());       // 商品属性组合名
-            nio.setOrgProdId(od.getOrgProdId());   // 元商品ID
-            nio.setMateId(od.getMateId());         // 素材ID
-            nio.setMateName(od.getMateName());     // 素材名称
-            nio.setProdType(od.getProdType());     // 商品区分
-            nio.setSurfaceQty(od.getSurfaceQty());
-            nio.setUnitQty(od.getUnitQty());
-            nio.setOrderQty(od.getBuyQty());       // 订单数量
-            nio.setReturnQty(od.getReturnQty());   // 退货数量
-            nio.setPrice(getPrice(nio));     // 购方购买单价
-            nio.setFinishTime(od.getFinishTime()); // 订单完成时间
-            nio.setOrderStatus(od.getOrderDetailStatus());// 订单状态
-//            nio.setInvoiceTime();// 开票时间
-            nio.setInvoiceStatus(EInvoiceStatus.UNBILLED.getVal());// 开票状态
-//            nio.setInvoiceBatchNo("");// 开票批次号
-//            nio.setInvoiceBillNo("");// 发票请求流水号
-            nio.setDelFlag(EDelete.FALSE.getVal());// 删除标志（0代表存在 2代表删除）
-            nio.setCreateUser(opName);             // 创建用户
-            nio.setCreateTime(nowDate);            // 创建时间
-            nio.setUpdateUser(opName);             // 更新用户
-            nio.setUpdateTime(nowDate);            // 更新时间
-            iInvoiceOrderService.insertInvoiceOrder(nio);
-        }
-
-        if(EDeptType.MERCHANT.getVal().equals(sellerRole)) {
-            buildM2MInvoiceOrder(order, orderDetailList, sellerId, sellerRole);
-        }
-    }
-
-    /**
-     * 构建清算数据 平台与供应商
-     *
-     * @param order
-     */
-    public void buildV2PInvoiceOrder(Order order, List<OrderDetail> orderDetailList) {
-
-        String opName = "发票订单创建MQ";
-        Date nowDate = DateUtils.getNowDate();
-
-        List<OrderDetail> unpackDetailList = new ArrayList<>();
-
-        for (OrderDetail od : orderDetailList) {
-            if(!EYesNo.YES.getVal().equals(od.getPfSellFlag())) {
-                // 非平台经销商品
-                continue;
-            }
-//            NORMAL("NORMAL", "常规商品"),
-//            CUSTOMIZABLE("CUSTOMIZABLE", "定制商品"),
-//            MATERIAL("MATERIAL", "素材");
-//            FIXED("FIXED", "固化商品"),
-//            HALF_FIXED("HALF_FIXED", "半固化商品"),
-//            MERCPROD("MERC_PRODUCT", "商户商品"),
-//            MERCMATE("MERC_MATERIAL", "商户素材"),
-            if (EProdType.MERCPROD.getVal().equals(od.getProdType())
-                    || EProdType.MERCMATE.getVal().equals(od.getProdType())) {
-                continue;
-            }
-            if (EProdType.FIXED.getVal().equals(od.getProdType())
-                    || EProdType.HALF_FIXED.getVal().equals(od.getProdType())) {
-                // 拆商品
-
-                // 商品固化设计面数量 TODO 平台商品需要转换为供应商商品？
-                int surfaceQty = iProdMateMqService.selectProdMateSurfaceQty(od.getProdId(), od.getPprId());
-                Prod orgProd = iProdService.selectProdByProdId(od.getOrgProdId());
-                OrderDetail nod = new OrderDetail();
-                BeanUtils.copyBeanProp(nod, od);
-                nod.setProdId(orgProd.getProdId());
-                nod.setProdName(orgProd.getProdName());
-                nod.setProdType(orgProd.getProdType());
-                nod.setSurfaceQty(surfaceQty + od.getSurfaceQty());
-                unpackDetailList.add(nod);
-
-                // 查询所用素材
-                List<ProdMateMq> prodMateList = iProdMateMqService.selectProdMateUnitQty(od.getProdId(), od.getPprId());
-                for(ProdMateMq pmm : prodMateList) {
-                    // 素材的归属商户
-                    MaterialKindMq mkm = iMaterialKindMqService.selectMaterialKindMqByMateId(pmm.getMateId());
-                    if(EMateBelong.MERC.getVal().equals(mkm.getMateBelong())) {
-                        continue;
-                    }
-                    OrderDetail nmod = new OrderDetail();
-                    nmod.setOrderDetailId(od.getOrderDetailId());
-                    nmod.setOrderId(od.getOrderId());
-                    nmod.setSuiteId(od.getSuiteId());
-                    nmod.setProdId(orgProd.getProdId());
-                    nmod.setProdName(orgProd.getProdName());
-                    nmod.setProdType(EProdType.MATERIAL.getVal());
-                    nmod.setMateId(pmm.getMateId());
-                    nmod.setMateName(pmm.getMateName());
-                    //nmod.setMateType(EMateType);
-                    nmod.setVendorId(mkm.getVendorId());
-                    nmod.setSurfaceQty(0);
-                    nmod.setUnitQty(pmm.getMateQty());
-                    nmod.setBuyQty(od.getBuyQty());
-                    nmod.setAfterQty(od.getAfterQty());
-                    nmod.setReturnQty(od.getReturnQty());
-                    //nmod.setBuyPrice(od.getSalePrice());
-                    nmod.setSurfaceQty(surfaceQty + od.getSurfaceQty());
-                    nmod.setOrderDetailStatus(od.getOrderDetailStatus());
-                    unpackDetailList.add(nmod);
-                }
-            } else {
-                OrderDetail nod = new OrderDetail();
-                BeanUtils.copyBeanProp(nod, od);
-                unpackDetailList.add(nod);
-            }
-        }
-        // 供应商
-        // 按照供应商分组
-        Map<Long, List<OrderDetail>> orderMap = unpackDetailList.stream().collect(Collectors.groupingBy(item -> item.getVendorId()));
-        for (Map.Entry<Long, List<OrderDetail>> orderEntry : orderMap.entrySet()) {
-            Long vendorId = orderEntry.getKey();
-            SysDept vendorDept = iSysDeptService.selectDeptById(vendorId);
-            if(!EDeptType.VENDOR.equals(vendorDept.getDeptType())){
-                continue;
-            }
-
-            // 明细
-            List<OrderDetail> details = orderEntry.getValue();
-            // 循环处理子订单
-            for (OrderDetail od : details) {
-                InvoiceOrder nio = new InvoiceOrder();
-                nio.setOrderId(order.getOrderId());       // 订单ID
-                nio.setOrderNo(order.getOrderNo());      // 订单号
-                nio.setOrderDetailId(od.getOrderDetailId());// 订单明细ID
-                nio.setBuyerId(100L);      // 购方ID
-                nio.setBuyerRole(ERoleKey.PLATFORM.getCode());  // 购方角色
-                nio.setSellerId(vendorId);    // 销方ID
-                nio.setSellerRole(vendorDept.getDeptType());// 销方角色
-                nio.setTradeType(ETradeType.V2P.getVal());  // 交易区分
-                nio.setPayeeId(order.getPayeeId());
-                nio.setPayeeRole(order.getPayeeRole());
-                nio.setSuiteId(od.getSuiteId());
-                nio.setProdId(od.getProdId());         // 商品ID
-                nio.setProdName(od.getProdName());     // 商品名
-                nio.setPprId(od.getPprId());           // 商品属性组合ID
-                nio.setPprName(od.getPprName());       // 商品属性组合名
-                nio.setOrgProdId(od.getOrgProdId());   // 元商品ID
-                nio.setMateId(od.getMateId());         // 素材ID
-                nio.setMateName(od.getMateName());     // 素材名称
-                nio.setProdType(od.getProdType());     // 商品区分
-                nio.setSurfaceQty(od.getSurfaceQty());
-                nio.setUnitQty(od.getUnitQty());
-                nio.setOrderQty(od.getBuyQty());       // 订单数量
-                nio.setReturnQty(od.getReturnQty());   // 退货数量
-                nio.setPrice(getPrice(nio));     // 购方购买单价
-                nio.setFinishTime(od.getFinishTime()); // 订单完成时间
-                nio.setOrderStatus(od.getOrderDetailStatus());// 订单状态
-//              nio.setInvoiceTime();// 开票时间
-                nio.setInvoiceStatus(EInvoiceStatus.UNBILLED.getVal());// 开票状态
-//              nio.setInvoiceBatchNo("");// 开票批次号
-//              nio.setInvoiceBillNo("");// 发票请求流水号
-                nio.setDelFlag(EDelete.FALSE.getVal());// 删除标志（0代表存在 2代表删除）
-                nio.setCreateUser(opName);             // 创建用户
-                nio.setCreateTime(nowDate);            // 创建时间
-                nio.setUpdateUser(opName);             // 更新用户
-                nio.setUpdateTime(nowDate);            // 更新时间
-                iInvoiceOrderService.insertInvoiceOrder(nio);
-            }
-        }
-    }
-
-    /**
-     * 交易区分
-     *
-     * @param buyerRole
-     * @param sellerRole
-     * @return
-     */
-    private ETradeType getTradeType(String buyerRole, String sellerRole){
-        if(ERoleKey.CUSTOMER.getCode().equals(buyerRole)){
-            if(ERoleKey.MERCHANT.getCode().equals(sellerRole)) {
-                return ETradeType.M2C;
-            }
-        } else if(ERoleKey.MERCHANT.getCode().equals(buyerRole)) {
-            if(ERoleKey.MERCHANT.getCode().equals(sellerRole)) {
-                return ETradeType.M2M;
-            } else if(ERoleKey.PLATFORM.getCode().equals(sellerRole)){
-                return ETradeType.P2M;
-            }
-        }
-        return ETradeType.V2P;
-    }
-
-    /**
-     * 取价格
-     *
-     * @param invoiceOrder
-     * @return
-     */
-    private BigDecimal getPrice(InvoiceOrder invoiceOrder) {
-
-        if(EProdType.NORMAL.getVal().equals(invoiceOrder.getProdType())
-                || EProdType.CUSTOMIZABLE.getVal().equals(invoiceOrder.getProdType())
-                || EProdType.FIXED.getVal().equals(invoiceOrder.getProdType())
-                || EProdType.HALF_FIXED.getVal().equals(invoiceOrder.getProdType())
-                || EProdType.MERCPROD.getVal().equals(invoiceOrder.getProdType())) {
-            // 查询商品价格
-            ProdPrice spp = new ProdPrice();
-            spp.setProdId(invoiceOrder.getProdId());
-            spp.setPprId(invoiceOrder.getPprId());
-            spp.setBuyerId(invoiceOrder.getBuyerId());
-            spp.setSalesmanId(invoiceOrder.getSellerId());
-            spp.setSurfaceQty(invoiceOrder.getSurfaceQty());
-
-            return iProdPriceMqService.getProdPriceByUnionId(spp);
-        } else {
-            // 查询素材价格
-            MatePrice smp = new MatePrice();
-            smp.setMateId(invoiceOrder.getMateId());
-            smp.setBuyerId(invoiceOrder.getBuyerId());
-            smp.setSalesmanId(invoiceOrder.getSellerId());
-            return iMatePriceMqService.getMatePriceByUnionId(smp);
-        }
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/invoice/InvoiceOrderReturnedConsumer.java

@@ -1,87 +0,0 @@
-package com.xingxi.mq.consumer.invoice;
-
-import cn.com.wingxi.biandan.common.mq.bo.order.OrderReturnedBO;
-import cn.com.wingxi.biandan.common.mq.constant.OrderMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import com.xingxi.mq.server.order.service.IInvoiceOrderMqService;
-import cn.com.wingxi.biandan.system.order.domain.InvoiceOrder;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * @ClassName InvoiceOrderReturnedConsumer
- * @projectName hocy
- * @Deacription 订单退货消息接受处理
- *              更新退货数量
- * @Author FZ.Dong
- * @Date 2020/9/15 16:56
- * @Version 1.0
- **/
-@Slf4j
-@Component
-public class InvoiceOrderReturnedConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private IInvoiceOrderMqService iInvoiceOrderMqService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_INVOICE_FOR_RETURNED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_INVOICE_FOR_RETURNED,
-                OrderMqKey.EDIT_ROUTE_FOR_CANCELED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_INVOICE_FOR_RETURNED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("发票订单退货完成MQ： 处理推送的订单数据【{}】", body);
-
-        Date nowDate = DateUtils.getNowDate();
-
-        // json对象转换
-        List<OrderReturnedBO> returnList = JSON.parseArray(body, OrderReturnedBO.class);
-
-        for (OrderReturnedBO orbo : returnList) {
-            int returnQty = 0;
-            if(orbo.getStockQty() != null) {
-                returnQty = orbo.getStockQty();
-            }
-            if(orbo.getScrapQty() != null) {
-                returnQty = returnQty + orbo.getScrapQty();
-            }
-            if(returnQty <= 0) {
-                continue;
-            }
-            InvoiceOrder uio = new InvoiceOrder();
-            // 设置订单编号
-            uio.setOrderId(orbo.getOrderId());
-            uio.setOrderDetailId(orbo.getOrderDetailId());
-            uio.setSuiteId(orbo.getSuiteId());
-            uio.setReturnQty(returnQty);
-            uio.setUpdateTime(nowDate);
-            uio.setUpdateUser("发票订单退货完成MQ");
-            iInvoiceOrderMqService.updateInvoiceOrderReturnQty(uio);
-        }
-
-        log.info("发票订单退货完成MQ： 推送的订单数据处理完成.");
-        return true;
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/order/OrderCloseConsumer.java

@@ -1,22 +1,7 @@
 package com.xingxi.mq.consumer.order;
 
-import cn.com.wingxi.biandan.common.enums.EOrderDetailStatus;
-import cn.com.wingxi.biandan.common.enums.EOrderStatus;
-import cn.com.wingxi.biandan.common.enums.EStockBillKind;
-import cn.com.wingxi.biandan.common.enums.EStockBillType;
-import cn.com.wingxi.biandan.common.mq.bo.order.OrderBO;
-import cn.com.wingxi.biandan.common.mq.constant.OrderMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import com.xingxi.mq.server.order.service.IPaymentInfoMqService;
-import com.xingxi.mq.server.product.domain.ProdStockVo;
-import com.xingxi.mq.server.product.service.IProdStockVoService;
-import cn.com.wingxi.biandan.system.order.domain.Order;
-import cn.com.wingxi.biandan.system.order.domain.OrderDetail;
-import cn.com.wingxi.biandan.system.order.domain.PaymentInfo;
-import cn.com.wingxi.biandan.system.order.service.IOrderDetailService;
-import cn.com.wingxi.biandan.system.order.service.IOrderService;
-import com.alibaba.fastjson.JSON;
+import com.xingxi.common.mq.constant.OrderMqKey;
+import com.xingxi.common.mq.core.AbstractRabbitConsumer;
 import com.google.common.collect.Lists;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
@@ -26,26 +11,11 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
-import java.util.Date;
 import java.util.List;
 
 @Slf4j
 @Component
 public class OrderCloseConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private IProdStockVoService prodStockVoService;
-
-    @Resource
-    private IOrderService orderService;
-
-    @Resource
-    private IOrderDetailService orderDetailService;
-
-    @Resource
-    private IPaymentInfoMqService paymentInfoMqService;
-
     @Bean(OrderMqKey.EDIT_QUEUE_DELAY_FOR_UNPAID)
     @Override
     protected List<Binding> getBindingList() {
@@ -63,103 +33,8 @@ public class OrderCloseConsumer extends AbstractRabbitConsumer {
         this.convertMessage(message, channel);
     }
 
-
     @Override
     public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("订单关闭MQ,处理推送的订单数据【{}】.", body);
-
-        OrderBO orderBO = JSON.parseObject(body, OrderBO.class);
-
-        Date nowDate = DateUtils.getNowDate();
-        String opName = "订单关闭MQ";
-
-        if(orderBO == null || orderBO.getOrderId() == null || orderBO.getOrderId() == 0L) {
-            return true;
-        }
-        // 如果没有支付成功就取消
-        Order orgOrder = orderService.selectOrderByOrderId(orderBO.getOrderId());
-        if(orgOrder == null) {
-            log.info("订单关闭MQ,订单【{}】的信息不存在,不做处理.", orderBO.getOrderNo());
-            return true;
-        }
-        if(!EOrderStatus.ORDERED.getVal().equals(orgOrder.getOrderStatus())) {
-            log.info("订单关闭MQ,订单【{}】的订单状态为【{}】,非【{}】不做处理.", orgOrder.getOrderNo(), orgOrder.getOrderStatus(), EOrderStatus.ORDERED.getDesc());
-            return true;
-        }
-
-//        // 支付信息
-//        PaymentInfo spi = new PaymentInfo();
-//        spi.setOrderId(orgOrder.getOrderId());
-//        spi.setDelFlag(EDelete.FALSE.getVal());
-//        List<PaymentInfo> paymentInfoList = paymentInfoService.selectPaymentInfoList(spi);
-//        if(CollectionUtils.isNotEmpty(paymentInfoList)){
-//            PaymentInfo pi = paymentInfoList.get(0);
-//            if(pi != null) {
-//                if(EPayKind.WXECOM.getVal().equals(pi.getPayKind())) {
-//                    // 查询是否支付成功
-//                    CombineTransactionsResult response = wxPayService.getEcommerceService().queryCombineTransactions(orderBO.getOrderNo());
-//                    if (response != null) {
-//                        // 如果支付成功并且微信支付没有回调成功就在这里继续推进订单 TODO
-//                        return true;
-//                    }
-//                } else if(EPayKind.WXPAY.getVal().equals(pi.getPayKind())) {
-//                    // 查询是否支付成功 TODO
-//                    // 如果支付成功并且微信支付没有回调成功就在这里继续推进订单 TODO
-//                    return true;
-//                }
-//            }
-//        }
-
-        // 取消主订单
-        Order order = new Order();
-        order.setOrderId(orgOrder.getOrderId());
-        order.setOrderStatus(EOrderStatus.CANCELLED.getVal());
-        order.setCancelTime(nowDate);
-        order.setUpdateUser(opName);
-        order.setUpdateTime(nowDate);
-        orderService.updateOrder(order);
-
-        // 取消子订单
-        OrderDetail sod = new OrderDetail();
-        sod.setOrderId(order.getOrderId());
-        List<OrderDetail> orderDetails = orderDetailService.selectOrderDetailList(sod);
-        for (OrderDetail od : orderDetails) {
-            //将订单明细设为已取消
-            OrderDetail updateDetail = new OrderDetail();
-            updateDetail.setOrderDetailId(od.getOrderDetailId());
-            updateDetail.setOrderDetailStatus(EOrderDetailStatus.CANCELLED.getVal());
-            updateDetail.setUpdateUser(opName);
-            updateDetail.setUpdateTime(nowDate);
-            orderDetailService.updateOrderDetail(updateDetail);
-
-            //减少锁库，恢复库存
-            ProdStockVo sps = new ProdStockVo();
-            sps.setProdId(od.getProdId());
-            sps.setPprId(od.getPprId());
-            sps.setVendorId(od.getVendorId());
-
-            ProdStockVo ps = prodStockVoService.selectProdStockVoByUnionId(sps);
-            sps.setStockId(ps.getStockId());
-            sps.setAvailQty(od.getBuyQty());
-            sps.setOrderId(orgOrder.getOrderId());
-            sps.setOrderNo(orgOrder.getOrderNo());
-            sps.setBillType(EStockBillType.IN.getVal());
-            sps.setBillKind(EStockBillKind.IN_CANCEL.getVal());
-            sps.setUpdateUser(opName);
-            sps.setUpdateTime(nowDate);
-            prodStockVoService.updateProdStockQty(sps);
-        }
-
-        // 关闭支付信息
-        PaymentInfo upi = new PaymentInfo();
-        upi.setOrderId(orgOrder.getOrderId());
-        upi.setOrderStatus(EOrderStatus.CANCELLED.getVal());
-        upi.setUpdateUser(opName);
-        upi.setUpdateTime(nowDate);
-        paymentInfoMqService.updateOrderStatusByOrderId(upi);
-
-        log.info("订单关闭MQ,订单【{}】数据处理完成.", orgOrder.getOrderNo());
         return true;
     }
-
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/order/OrderCreatedConsumer.java

@@ -54,5 +54,4 @@ public class OrderCreatedConsumer extends AbstractRabbitConsumer {
         log.info("订单生成后推送至延迟队列MQ,订单【{}】数据处理完成.", orderBO.getOrderNo());
         return true;
     }
-
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/order/OrderReturnedConsumer.java

@@ -1,14 +1,14 @@
 package com.xingxi.mq.consumer.order;
 
-import cn.com.wingxi.biandan.common.mq.bo.order.OrderReturnedBO;
-import cn.com.wingxi.biandan.common.mq.constant.OrderMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import com.xingxi.mq.server.order.service.IOrderDetailVoService;
-import cn.com.wingxi.biandan.system.order.domain.OrderDetail;
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.rabbitmq.client.Channel;
+import com.xingxi.common.mq.bo.order.OrderReturnedBO;
+import com.xingxi.common.mq.constant.OrderMqKey;
+import com.xingxi.common.mq.core.AbstractRabbitConsumer;
+import com.xingxi.common.utils.DateUtils;
+import com.xingxi.mq.server.order.service.IOrderDetailVoService;
+import com.xingxi.order.domain.OrderDetail;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Binding;
 import org.springframework.amqp.core.Message;
@@ -24,7 +24,6 @@ import java.util.List;
  * 退货确认消息
  * 将退货数量从订单信息的售后中数量减少，增加只已退货数量中
  */
-
 @Slf4j
 @Component
 public class OrderReturnedConsumer extends AbstractRabbitConsumer {
@@ -56,14 +55,14 @@ public class OrderReturnedConsumer extends AbstractRabbitConsumer {
 
         for (OrderReturnedBO orbo : returnList) {
             int returnQty = 0;
-            if(orbo.getStockQty() != null) {
+            if (orbo.getStockQty() != null) {
                 returnQty = returnQty + orbo.getStockQty();
             }
-            if(orbo.getScrapQty() != null) {
+            if (orbo.getScrapQty() != null) {
                 returnQty = returnQty + orbo.getScrapQty();
             }
             int afterQty = returnQty;
-            if(orbo.getRejectQty() != null) {
+            if (orbo.getRejectQty() != null) {
                 afterQty = afterQty + orbo.getRejectQty();
             }
             OrderDetail uod = new OrderDetail();
@@ -81,5 +80,4 @@ public class OrderReturnedConsumer extends AbstractRabbitConsumer {
         log.info("订单退货完成MQ,推送的订单数据处理完成.");
         return true;
     }
-
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/refund/OrderCancelledConsumer.java

@@ -1,178 +0,0 @@
-package com.xingxi.mq.consumer.refund;
-
-import cn.com.wingxi.biandan.common.enums.EDelete;
-import cn.com.wingxi.biandan.common.enums.EWxRefundStatus;
-import cn.com.wingxi.biandan.common.mq.bo.order.OrderCanceledBO;
-import cn.com.wingxi.biandan.common.mq.constant.OrderMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import cn.com.wingxi.biandan.common.utils.StringUtils;
-import cn.com.wingxi.biandan.common.utils.uuid.IdUtils;
-import cn.com.wingxi.biandan.system.order.domain.Order;
-import cn.com.wingxi.biandan.system.order.domain.OrderDetail;
-import cn.com.wingxi.biandan.system.order.domain.PaymentInfo;
-import cn.com.wingxi.biandan.system.order.domain.RefundInfo;
-import cn.com.wingxi.biandan.system.order.service.IOrderDetailService;
-import cn.com.wingxi.biandan.system.order.service.IOrderService;
-import cn.com.wingxi.biandan.system.order.service.IPaymentInfoService;
-import cn.com.wingxi.biandan.system.order.service.IRefundInfoService;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Component
-public class OrderCancelledConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private IOrderService orderService;
-
-    @Resource
-    private IOrderDetailService orderDetailService;
-
-    @Resource
-    private IPaymentInfoService iPaymentInfoService;
-
-    @Resource
-    private IRefundInfoService iRefundInfoService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_ORDER_FOR_CANCELLED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_ORDER_FOR_CANCELLED,
-                OrderMqKey.EDIT_ROUTE_FOR_RETURNED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_ORDER_FOR_CANCELLED)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("订单取消退款MQ, 处理推送的订单数据【{}】.", body);
-        Date nowDate = DateUtils.getNowDate();
-
-        List<OrderCanceledBO> canceledlist = JSON.parseArray(body, OrderCanceledBO.class);
-
-        // 按照订单分组
-        Map<Long, List<OrderCanceledBO>> orderMap = canceledlist.stream().collect(Collectors.groupingBy(item -> item.getOrderId()));
-
-        String orderNo = "";
-        // 按照订单分组
-        for (Map.Entry<Long, List<OrderCanceledBO>> orderEntry : orderMap.entrySet()) {
-
-            // 订单ID
-            Long orderId = orderEntry.getKey();
-            Order order = orderService.selectOrderByOrderId(orderId);
-            if (order == null) {
-                log.info("订单取消退款MQ,订单【{}】信息未查询到，不处理.", order.getOrderNo());
-                continue;
-            }
-
-            if (StringUtils.isEmpty(orderNo)) {
-                orderNo = order.getOrderNo();
-            } else {
-                orderNo = orderNo + "," + order.getOrderNo();
-            }
-            // 取消明细
-            List<OrderCanceledBO> returns = orderEntry.getValue();
-
-            // 订单支付信息
-            PaymentInfo paymentInfo = new PaymentInfo();
-            paymentInfo.setOrderId(orderId);
-            paymentInfo.setSellerId(order.getSellerId());
-            paymentInfo.setDelFlag(EDelete.FALSE.getVal());
-            // 获取订单的支付信息
-            List<PaymentInfo> paymentInfoList = iPaymentInfoService.selectPaymentInfoList(paymentInfo);
-            if (paymentInfoList != null && paymentInfoList.size() > 0) {
-                paymentInfo = paymentInfoList.get(0);
-            } else {
-                log.info("订单取消退款MQ,订单【{}】支付信息未查询到，不处理.", order.getOrderNo());
-                continue;
-            }
-
-            // 退款金额
-            BigDecimal refundAmount = BigDecimal.ZERO;
-            for (OrderCanceledBO ocb : returns) {
-                OrderDetail sod = new OrderDetail();
-                sod.setOrderId(ocb.getOrderId());
-                sod.setOrderDetailId(ocb.getOrderDetailId());
-                sod.setSuiteId(ocb.getSuiteId());
-                List<OrderDetail> odList = orderDetailService.selectOrderDetailList(sod);
-                for(OrderDetail od : odList) {
-                    // 订单数量-退货数量
-                    int qty = od.getBuyQty() - od.getReturnQty();
-                    // 单价 *（订单数量-退货数量）
-                    BigDecimal amount = od.getBuyPrice().multiply(new BigDecimal(qty + ""));
-
-                    refundAmount.add(amount);
-                }
-            }
-
-            if (BigDecimal.ZERO.compareTo(refundAmount) >= 0) {
-                continue;
-            }
-
-            // 退款信息
-            String refundNo = IdUtils.snowFlake();
-
-            RefundInfo refundInfo = new RefundInfo();
-            // 订单ID
-            refundInfo.setOrderId(order.getOrderId());
-            // 订单号
-            refundInfo.setOrderNo(order.getOrderNo());
-            // 订单退货ID
-            //refundInfo.setReturnId(orderReturnedBO.getReturnId());
-            // 退货单号
-            refundInfo.setReturnNo(refundNo);
-            // 电商平台APPID
-            refundInfo.setSpAppid(paymentInfo.getCombineAppid());
-            // 二级商户号
-            refundInfo.setSubMchid(paymentInfo.getSubMchid());
-            // 微信支付号
-            refundInfo.setTransactionId(paymentInfo.getTransactionId());
-            // 商户订单号
-            refundInfo.setOutTradeNo(paymentInfo.getOutTradeNo());
-            // 商户退款单号
-            refundInfo.setOutRefundNo(refundNo);
-            // 退款原因
-            refundInfo.setRefundReason("取消订单");
-            // 退款金额
-            refundInfo.setRefundAmount(refundAmount);
-            // 原订单金额
-            refundInfo.setOrderTotal(paymentInfo.getPayAmount());
-            // 退款币种
-            refundInfo.setRefundCurrency(paymentInfo.getSubCurrency());
-            // 退款结果回调url TODO
-            refundInfo.setNotifyUrl("");
-            // 退款状态
-            refundInfo.setWxRefundStatus(EWxRefundStatus.PENDING.getVal());
-            refundInfo.setDelFlag(EDelete.FALSE.getVal());
-            refundInfo.setCreateUser("订单取消退款MQ");
-            refundInfo.setCreateTime(nowDate);
-            refundInfo.setUpdateUser("订单取消退款MQ");
-            refundInfo.setUpdateTime(nowDate);
-            iRefundInfoService.insertRefundInfo(refundInfo);
-
-        }
-        log.info("订单取消退款MQ,订单【{}】数据处理完成.", orderNo);
-        return true;
-    }
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/consumer/refund/OrderRefundConsumer.java

@@ -1,145 +0,0 @@
-package com.xingxi.mq.consumer.refund;
-
-import cn.com.wingxi.biandan.common.enums.EDelete;
-import cn.com.wingxi.biandan.common.enums.ERefundStatus;
-import cn.com.wingxi.biandan.common.enums.EWxRefundStatus;
-import cn.com.wingxi.biandan.common.mq.bo.order.OrderReturnedBO;
-import cn.com.wingxi.biandan.common.mq.constant.OrderMqKey;
-import cn.com.wingxi.biandan.common.mq.core.AbstractRabbitConsumer;
-import cn.com.wingxi.biandan.common.utils.DateUtils;
-import cn.com.wingxi.biandan.common.utils.StringUtils;
-import cn.com.wingxi.biandan.common.utils.uuid.IdUtils;
-import cn.com.wingxi.biandan.system.order.domain.PaymentInfo;
-import cn.com.wingxi.biandan.system.order.domain.RefundInfo;
-import cn.com.wingxi.biandan.system.order.service.IPaymentInfoService;
-import cn.com.wingxi.biandan.system.order.service.IRefundInfoService;
-import com.alibaba.fastjson.JSON;
-import com.google.common.collect.Lists;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Binding;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Slf4j
-@Component
-public class OrderRefundConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private IPaymentInfoService iPaymentInfoService;
-
-    @Resource
-    private IRefundInfoService iRefundInfoService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_ORDER_RETURNED_FOR_REFUND)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_ORDER_RETURNED_FOR_REFUND,
-                OrderMqKey.EDIT_ROUTE_FOR_RETURNED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_ORDER_RETURNED_FOR_REFUND)
-    @Override
-    public void onMessage(Message message, Channel channel) throws Exception {
-        this.convertMessage(message, channel);
-    }
-
-    @Override
-    public boolean execute(String body, Channel channel, Message message) throws Exception {
-        log.info("订单退货退款MQ, 处理推送的订单数据【{}】.", body);
-        Date nowDate = DateUtils.getNowDate();
-
-        List<OrderReturnedBO> returnList = JSON.parseArray(body, OrderReturnedBO.class);
-
-        // 按照订单分组
-        Map<Long, List<OrderReturnedBO>> orderMap = returnList.stream().collect(Collectors.groupingBy(item -> item.getOrderId()));
-
-        String orderNo = "";
-        // 按照订单分组
-        for (Map.Entry<Long, List<OrderReturnedBO>> orderEntry : orderMap.entrySet()) {
-
-            // 退款明细
-            List<OrderReturnedBO> returns = orderEntry.getValue();
-            // 退款金额
-            BigDecimal refundAmount = returns.stream().map(OrderReturnedBO::getReturnAmt).reduce(BigDecimal.ZERO, BigDecimal::add);
-            if(BigDecimal.ZERO.compareTo(refundAmount) >= 0) {
-                continue;
-            }
-
-            OrderReturnedBO orderReturnedBO = returns.get(0);
-
-            if(StringUtils.isEmpty(orderNo)) {
-                orderNo = orderReturnedBO.getOrderNo();
-            } else {
-                orderNo = orderNo + "," + orderReturnedBO.getOrderNo();
-            }
-
-            // 订单支付信息
-            PaymentInfo paymentInfo = new PaymentInfo();
-            paymentInfo.setOrderId(orderReturnedBO.getOrderId());
-            paymentInfo.setSellerId(orderReturnedBO.getSellerId());
-            paymentInfo.setDelFlag(EDelete.FALSE.getVal());
-            // 获取订单的支付信息
-            List<PaymentInfo> paymentInfoList = iPaymentInfoService.selectPaymentInfoList(paymentInfo);
-            if (paymentInfoList != null && paymentInfoList.size() > 0) {
-                paymentInfo = paymentInfoList.get(0);
-            } else {
-                log.info("订单退货退款MQ,订单【{}】支付信息未查询到，不处理.", orderReturnedBO.getOrderNo());
-                continue;
-            }
-
-            // 退款信息
-            RefundInfo refundInfo = new RefundInfo();
-            // 订单ID
-            refundInfo.setOrderId(orderReturnedBO.getOrderId());
-            // 订单号
-            refundInfo.setOrderNo(orderReturnedBO.getOrderNo());
-            // 订单退货ID
-            refundInfo.setReturnId(orderReturnedBO.getReturnId());
-            // 退货单号
-            refundInfo.setReturnNo(orderReturnedBO.getReturnNo());
-            // 电商平台APPID
-            refundInfo.setSpAppid(paymentInfo.getCombineAppid());
-            // 二级商户号
-            refundInfo.setSubMchid(paymentInfo.getSubMchid());
-            // 微信支付号
-            refundInfo.setTransactionId(paymentInfo.getTransactionId());
-            // 商户订单号
-            refundInfo.setOutTradeNo(paymentInfo.getOutTradeNo());
-            // 商户退款单号
-            refundInfo.setOutRefundNo(IdUtils.snowFlake());
-            // 退款原因
-            refundInfo.setRefundReason(StringUtils.isEmpty(orderReturnedBO.getReturnReason()) ? "退货退款" : orderReturnedBO.getReturnReason());
-            // 退款金额
-            refundInfo.setRefundAmount(refundAmount);
-            // 原订单金额
-            refundInfo.setOrderTotal(paymentInfo.getPayAmount());
-            // 退款币种
-            refundInfo.setRefundCurrency(paymentInfo.getSubCurrency());
-            // 退款结果回调url TODO
-            refundInfo.setNotifyUrl("");
-            // 退款状态
-            refundInfo.setWxRefundStatus(EWxRefundStatus.PENDING.getVal());
-            refundInfo.setDelFlag(EDelete.FALSE.getVal());
-            refundInfo.setCreateUser("订单退货退款MQ");
-            refundInfo.setCreateTime(nowDate);
-            refundInfo.setUpdateUser("订单退货退款MQ");
-            refundInfo.setUpdateTime(nowDate);
-            iRefundInfoService.insertRefundInfo(refundInfo);
-
-        }
-        log.info("订单退货退款MQ,订单【{}】数据处理完成.", orderNo);
-        return true;
-    }
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/master/mapper/CompanyMqMapper.java

@@ -1,24 +0,0 @@
-package com.xingxi.mq.server.master.mapper;
-
-import cn.com.wingxi.biandan.system.master.domain.Company;
-import org.springframework.stereotype.Repository;
-
-/**
- * 公司信息Mapper接口
- * 
- * @author biandan
- * @date 2022-02-17
- */
-@Repository
-public interface CompanyMqMapper
-{
-
-    /**
-     * 查询公司信息
-     *
-     * @param companyCode 公司Code
-     * @return 公司信息Vo
-     */
-    public Company selectCompanyByCompanyCode(String companyCode);
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/master/service/ICompanyMqService.java

@@ -1,22 +0,0 @@
-package com.xingxi.mq.server.master.service;
-
-import cn.com.wingxi.biandan.system.master.domain.Company;
-
-/**
- * 公司信息VoService接口
- * 
- * @author biandan
- * @date 2022-02-17
- */
-public interface ICompanyMqService
-{
-
-    /**
-     * 查询公司信息
-     *
-     * @param companyCode 公司Code
-     * @return 公司信息Vo
-     */
-    public Company selectCompanyByCompanyCode(String companyCode);
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/master/service/impl/CompanyMqServiceImpl.java

@@ -1,33 +0,0 @@
-package com.xingxi.mq.server.master.service.impl;
-
-import com.xingxi.mq.server.master.mapper.CompanyMqMapper;
-import com.xingxi.mq.server.master.service.ICompanyMqService;
-import cn.com.wingxi.biandan.system.master.domain.Company;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 公司信息Service业务层处理
- * 
- * @author biandan
- * @date 2022-02-17
- */
-@Service
-public class CompanyMqServiceImpl implements ICompanyMqService
-{
-    @Autowired
-    private CompanyMqMapper companyMqMapper;
-
-    /**
-     * 查询公司信息
-     *
-     * @param companyCode 公司信息主键
-     * @return 公司信息Vo
-     */
-    @Override
-    public Company selectCompanyByCompanyCode(String companyCode)
-    {
-        return companyMqMapper.selectCompanyByCompanyCode(companyCode);
-    }
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/material/domain/MaterialKindMq.java

@@ -1,23 +0,0 @@
-package com.xingxi.mq.server.material.domain;
-
-import cn.com.wingxi.biandan.system.material.domain.MaterialKind;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 素材分类对象 m_material_kind
- * 
- * @author biandan
- * @date 2022-02-18
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class MaterialKindMq extends MaterialKind
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 素材ID */
-    private Long mateId;
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/material/mapper/MatePriceMqMapper.java

@@ -1,24 +0,0 @@
-package com.xingxi.mq.server.material.mapper;
-
-import cn.com.wingxi.biandan.system.material.domain.MatePrice;
-import org.springframework.stereotype.Repository;
-
-import java.math.BigDecimal;
-
-/**
- * 素材价格Mapper接口
- * 
- * @author biandan
- * @date 2022-02-18
- */
-@Repository
-public interface MatePriceMqMapper
-{
-    /**
-     * 查询素材价格
-     *
-     * @param matePrice 素材
-     * @return 素材价格
-     */
-    public BigDecimal getMatePriceByUnionId(MatePrice matePrice);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/material/mapper/MaterialKindMqMapper.java

@@ -1,23 +0,0 @@
-package com.xingxi.mq.server.material.mapper;
-
-import com.xingxi.mq.server.material.domain.MaterialKindMq;
-import org.springframework.stereotype.Repository;
-
-/**
- * 素材分类Mapper接口
- * 
- * @author biandan
- * @date 2022-02-18
- */
-@Repository
-public interface MaterialKindMqMapper
-{
-
-    /**
-     * 查询素材分类
-     *
-     * @param mateId 素材主键
-     * @return 素材分类Vo
-     */
-    public MaterialKindMq selectMaterialKindMqByMateId(Long mateId);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/material/service/IMatePriceMqService.java

@@ -1,22 +0,0 @@
-package com.xingxi.mq.server.material.service;
-
-import cn.com.wingxi.biandan.system.material.domain.MatePrice;
-
-import java.math.BigDecimal;
-
-/**
- * 素材价格VoService接口
- * 
- * @author biandan
- * @date 2022-02-18
- */
-public interface IMatePriceMqService
-{
-    /**
-     * 查询素材价格
-     *
-     * @param matePrice 素材
-     * @return 素材价格
-     */
-    public BigDecimal getMatePriceByUnionId(MatePrice matePrice);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/material/service/IMaterialKindMqService.java

@@ -1,21 +0,0 @@
-package com.xingxi.mq.server.material.service;
-
-import com.xingxi.mq.server.material.domain.MaterialKindMq;
-
-/**
- * 素材分类VoService接口
- * 
- * @author biandan
- * @date 2022-02-18
- */
-public interface IMaterialKindMqService
-{
-
-    /**
-     * 查询素材分类
-     *
-     * @param mateId 素材主键
-     * @return 素材分类Vo
-     */
-    public MaterialKindMq selectMaterialKindMqByMateId(Long mateId);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/material/service/impl/MatePriceMqServiceImpl.java

@@ -1,35 +0,0 @@
-package com.xingxi.mq.server.material.service.impl;
-
-import com.xingxi.mq.server.material.mapper.MatePriceMqMapper;
-import com.xingxi.mq.server.material.service.IMatePriceMqService;
-import cn.com.wingxi.biandan.system.material.domain.MatePrice;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-
-/**
- * 素材价格Service业务层处理
- * 
- * @author biandan
- * @date 2022-02-18
- */
-@Service
-public class MatePriceMqServiceImpl implements IMatePriceMqService
-{
-
-    @Autowired
-    private MatePriceMqMapper matePriceMqMapper;
-
-    /**
-     * 查询素材价格
-     *
-     * @param matePrice 素材
-     * @return 素材价格
-     */
-    @Override
-    public BigDecimal getMatePriceByUnionId(MatePrice matePrice)
-    {
-        return matePriceMqMapper.getMatePriceByUnionId(matePrice);
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/material/service/impl/MaterialKindMqServiceImpl.java

@@ -1,32 +0,0 @@
-package com.xingxi.mq.server.material.service.impl;
-
-import com.xingxi.mq.server.material.domain.MaterialKindMq;
-import com.xingxi.mq.server.material.mapper.MaterialKindMqMapper;
-import com.xingxi.mq.server.material.service.IMaterialKindMqService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 素材分类Service业务层处理
- * 
- * @author biandan
- * @date 2022-02-18
- */
-@Service
-public class MaterialKindMqServiceImpl implements IMaterialKindMqService
-{
-    @Autowired
-    private MaterialKindMqMapper materialKindMqMapper;
-
-    /**
-     * 查询素材分类
-     *
-     * @param mateId 素材分类主键
-     * @return 素材分类Vo
-     */
-    @Override
-    public MaterialKindMq selectMaterialKindMqByMateId(Long mateId)
-    {
-        return materialKindMqMapper.selectMaterialKindMqByMateId(mateId);
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/mapper/ClearOrderDetailVoMapper.java

@@ -1,23 +1,21 @@
 package com.xingxi.mq.server.order.mapper;
 
-import cn.com.wingxi.biandan.system.order.domain.ClearOrderDetail;
+import com.xingxi.order.domain.ClearOrderDetail;
 import org.springframework.stereotype.Repository;
 
 /**
  * 清算订单详细信息Mapper接口
- * 
- * @author biandan
- * @date 2022-02-23
+ *
+ * @author xingxi
+ * @date 2025-02-11
  */
 @Repository
-public interface ClearOrderDetailVoMapper
-{
-
+public interface ClearOrderDetailVoMapper {
     /**
      * 更新退货数量
      *
      * @param clearOrderDetail 清算订单详细信息
      * @return 清算订单详细信息Vo集合
      */
-    public int updateReturnQty(ClearOrderDetail clearOrderDetail);
+    int updateReturnQty(ClearOrderDetail clearOrderDetail);
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/mapper/ClearOrderVoMapper.java

@@ -1,17 +1,16 @@
 package com.xingxi.mq.server.order.mapper;
 
-import cn.com.wingxi.biandan.system.order.domain.ClearOrder;
+import com.xingxi.order.domain.ClearOrder;
 import org.springframework.stereotype.Repository;
 
 /**
  * 清算订单信息Mapper接口
- * 
+ *
  * @author biandan
- * @date 2022-02-23
+ * @date 2025-02-1
  */
 @Repository
-public interface ClearOrderVoMapper
-{
+public interface ClearOrderVoMapper {
 
     /**
      * 修改清算订单信息
@@ -19,5 +18,5 @@ public interface ClearOrderVoMapper
      * @param clearOrder 清算订单信息
      * @return 结果
      */
-    public int syncOrderStatusByOrderId(ClearOrder clearOrder);
+    int syncOrderStatusByOrderId(ClearOrder clearOrder);
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/mapper/CommissionOrderDetailVoMapper.java

@@ -1,23 +0,0 @@
-package com.xingxi.mq.server.order.mapper;
-
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrderDetail;
-import org.springframework.stereotype.Repository;
-
-/**
- * 推广者佣金订单详细信息Mapper接口
- * 
- * @author biandan
- * @date 2022-02-23
- */
-@Repository
-public interface CommissionOrderDetailVoMapper
-{
-
-    /**
-     * 修改推广者佣金订单详细信息
-     *
-     * @param commissionOrderDetail 推广者佣金订单详细信息
-     * @return 结果
-     */
-    public int updateCommissionOrderDetailVo(CommissionOrderDetail commissionOrderDetail);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/mapper/CommissionOrderVoMapper.java

@@ -1,31 +0,0 @@
-package com.xingxi.mq.server.order.mapper;
-
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrder;
-import org.springframework.stereotype.Repository;
-
-/**
- * 推广者佣金订单信息Mapper接口
- * 
- * @author biandan
- * @date 2022-02-23
- */
-@Repository
-public interface CommissionOrderVoMapper
-{
-
-    /**
-     * 修改推广者佣金订单信息
-     *
-     * @param commissionOrder 推广者佣金订单信息
-     * @return 结果
-     */
-    public int updateCommissionOrderVo(CommissionOrder commissionOrder);
-
-    /**
-     * 修改推广者佣金订单信息
-     *
-     * @param commissionOrder 推广者佣金订单信息
-     * @return 结果
-     */
-    public int syncOrderStatusByOrderId(CommissionOrder commissionOrder);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/mapper/InvoiceOrderMqMapper.java

@@ -1,23 +0,0 @@
-package com.xingxi.mq.server.order.mapper;
-
-import cn.com.wingxi.biandan.system.order.domain.InvoiceOrder;
-import org.springframework.stereotype.Repository;
-
-/**
- * 发票订单信息Mapper接口
- * 
- * @author biandan
- * @date 2022-04-02
- */
-@Repository
-public interface InvoiceOrderMqMapper
-{
-    /**
-     * 修改发票订单信息
-     * 
-     * @param invoiceOrder 发票订单信息
-     * @return 结果
-     */
-    public int updateInvoiceOrderReturnQty(InvoiceOrder invoiceOrder);
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/mapper/OrderDetailMqMapper.java

@@ -1,25 +1,24 @@
 package com.xingxi.mq.server.order.mapper;
 
-import cn.com.wingxi.biandan.system.order.domain.OrderDetail;
+import com.xingxi.order.domain.OrderDetail;
 import org.springframework.stereotype.Repository;
 
 /**
  * 订单明细Mapper接口
- * 
- * @author biandan
- * @date 2022-02-23
+ *
+ * @author xingxi
+ * @date 2025-02-11
  */
 @Repository
-public interface OrderDetailMqMapper
-{
+public interface OrderDetailMqMapper {
 
     /**
      * 校验订单是否完成
      *
-     * @param orderId
-     * @return
+     * @param orderId 订单ID
+     * @return 检查结果
      */
-    public int checkOrderFinished(Long orderId);
+    int checkOrderFinished(Long orderId);
 
     /**
      * 更新退货数量
@@ -27,5 +26,5 @@ public interface OrderDetailMqMapper
      * @param orderDetail 订单详细信息
      * @return 订单详细信息Vo集合
      */
-    public int updateReturnQty(OrderDetail orderDetail);
+    int updateReturnQty(OrderDetail orderDetail);
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/mapper/PaymentInfoMqMapper.java

@@ -1,22 +0,0 @@
-package com.xingxi.mq.server.order.mapper;
-
-import cn.com.wingxi.biandan.system.order.domain.PaymentInfo;
-import org.springframework.stereotype.Repository;
-
-/**
- * 支付信息Mapper接口
- * 
- * @author biandan
- * @date 2022-02-17
- */
-@Repository
-public interface PaymentInfoMqMapper
-{
-    /**
-     * 修改支付信息
-     * 
-     * @param paymentInfo 支付信息
-     * @return 结果
-     */
-    public int updateOrderStatusByOrderId(PaymentInfo paymentInfo);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/IClearOrderDetailVoService.java

@@ -1,22 +1,19 @@
 package com.xingxi.mq.server.order.service;
 
-import cn.com.wingxi.biandan.system.order.domain.ClearOrderDetail;
+import com.xingxi.order.domain.ClearOrderDetail;
 
 /**
  * 清算订单详细信息VoService接口
- * 
- * @author biandan
- * @date 2022-02-23
+ *
+ * @author xingxi
+ * @date 2024-02-11
  */
-public interface IClearOrderDetailVoService
-{
-
+public interface IClearOrderDetailVoService {
     /**
      * 更新退货数量
      *
      * @param clearOrderDetail 清算订单详细信息
      * @return 清算订单详细信息Vo集合
      */
-    public int updateReturnQty(ClearOrderDetail clearOrderDetail);
-
+    int updateReturnQty(ClearOrderDetail clearOrderDetail);
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/IClearOrderVoService.java

@@ -1,22 +1,19 @@
 package com.xingxi.mq.server.order.service;
 
-import cn.com.wingxi.biandan.system.order.domain.ClearOrder;
+import com.xingxi.order.domain.ClearOrder;
 
 /**
  * 清算订单信息VoService接口
- * 
+ *
  * @author biandan
- * @date 2022-02-23
+ * @date 2025-02-11
  */
-public interface IClearOrderVoService
-{
-
+public interface IClearOrderVoService {
     /**
      * 修改清算订单信息
      *
      * @param clearOrder 清算订单信息
      * @return 结果
      */
-    public int syncOrderStatusByOrderId(ClearOrder clearOrder);
-
+    int syncOrderStatusByOrderId(ClearOrder clearOrder);
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/ICommissionOrderDetailVoService.java

@@ -1,21 +0,0 @@
-package com.xingxi.mq.server.order.service;
-
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrderDetail;
-
-/**
- * 推广者佣金订单详细信息VoService接口
- * 
- * @author biandan
- * @date 2022-02-23
- */
-public interface ICommissionOrderDetailVoService
-{
-    /**
-     * 修改推广者佣金订单详细信息
-     *
-     * @param commissionOrderDetail 推广者佣金订单详细信息
-     * @return 结果
-     */
-    public int updateCommissionOrderDetailVo(CommissionOrderDetail commissionOrderDetail);
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/ICommissionOrderVoService.java

@@ -1,29 +0,0 @@
-package com.xingxi.mq.server.order.service;
-
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrder;
-
-/**
- * 推广者佣金订单信息VoService接口
- * 
- * @author biandan
- * @date 2022-02-23
- */
-public interface ICommissionOrderVoService
-{
-
-    /**
-     * 修改推广者佣金订单信息
-     *
-     * @param commissionOrder 推广者佣金订单信息
-     * @return 结果
-     */
-    public int updateCommissionOrderVo(CommissionOrder commissionOrder);
-
-    /**
-     * 修改推广者佣金订单信息
-     *
-     * @param commissionOrder 推广者佣金订单信息
-     * @return 结果
-     */
-    public int syncOrderStatusByOrderId(CommissionOrder commissionOrder);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/IInvoiceOrderMqService.java

@@ -1,20 +0,0 @@
-package com.xingxi.mq.server.order.service;
-
-import cn.com.wingxi.biandan.system.order.domain.InvoiceOrder;
-
-/**
- * 发票订单信息Service接口
- * 
- * @author biandan
- * @date 2022-04-02
- */
-public interface IInvoiceOrderMqService
-{
-    /**
-     * 修改发票订单信息
-     * 
-     * @param invoiceOrder 发票订单信息
-     * @return 结果
-     */
-    public int updateInvoiceOrderReturnQty(InvoiceOrder invoiceOrder);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/IOrderDetailVoService.java

@@ -1,15 +1,14 @@
 package com.xingxi.mq.server.order.service;
 
-import cn.com.wingxi.biandan.system.order.domain.OrderDetail;
+import com.xingxi.order.domain.OrderDetail;
 
 /**
  * 订单明细VoService接口
- * 
- * @author biandan
- * @date 2022-02-23
+ *
+ * @author xingxi
+ * @date 2025-02-11
  */
-public interface IOrderDetailVoService
-{
+public interface IOrderDetailVoService {
 
     /**
      * 校验订单是否完成
@@ -17,7 +16,7 @@ public interface IOrderDetailVoService
      * @param orderId
      * @return
      */
-    public int checkOrderFinished(Long orderId);
+    int checkOrderFinished(Long orderId);
 
     /**
      * 更新退货数量
@@ -25,6 +24,5 @@ public interface IOrderDetailVoService
      * @param orderDetail 订单详细信息
      * @return 订单详细信息Vo集合
      */
-    public int updateReturnQty(OrderDetail orderDetail);
-
+    int updateReturnQty(OrderDetail orderDetail);
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/IPaymentInfoMqService.java

@@ -1,20 +0,0 @@
-package com.xingxi.mq.server.order.service;
-
-import cn.com.wingxi.biandan.system.order.domain.PaymentInfo;
-
-/**
- * 支付信息Mapper接口
- * 
- * @author biandan
- * @date 2022-02-17
- */
-public interface IPaymentInfoMqService
-{
-    /**
-     * 修改支付信息
-     * 
-     * @param paymentInfo 支付信息
-     * @return 结果
-     */
-    public int updateOrderStatusByOrderId(PaymentInfo paymentInfo);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/impl/ClearOrderDetailVoServiceImpl.java

@@ -2,19 +2,18 @@ package com.xingxi.mq.server.order.service.impl;
 
 import com.xingxi.mq.server.order.mapper.ClearOrderDetailVoMapper;
 import com.xingxi.mq.server.order.service.IClearOrderDetailVoService;
-import cn.com.wingxi.biandan.system.order.domain.ClearOrderDetail;
+import com.xingxi.order.domain.ClearOrderDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
  * 清算订单详细信息Service业务层处理
- * 
- * @author biandan
- * @date 2022-02-23
+ *
+ * @author xingxi
+ * @date 2025-02-11
  */
 @Service
-public class ClearOrderDetailVoServiceImpl implements IClearOrderDetailVoService
-{
+public class ClearOrderDetailVoServiceImpl implements IClearOrderDetailVoService {
     @Autowired
     private ClearOrderDetailVoMapper clearOrderDetailVoMapper;
 
@@ -24,8 +23,7 @@ public class ClearOrderDetailVoServiceImpl implements IClearOrderDetailVoService
      * @param clearOrderDetail 清算订单详细信息
      * @return 清算订单详细信息Vo集合
      */
-    public int updateReturnQty(ClearOrderDetail clearOrderDetail)
-    {
+    public int updateReturnQty(ClearOrderDetail clearOrderDetail) {
         return clearOrderDetailVoMapper.updateReturnQty(clearOrderDetail);
     }
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/impl/ClearOrderVoServiceImpl.java

@@ -2,19 +2,18 @@ package com.xingxi.mq.server.order.service.impl;
 
 import com.xingxi.mq.server.order.mapper.ClearOrderVoMapper;
 import com.xingxi.mq.server.order.service.IClearOrderVoService;
-import cn.com.wingxi.biandan.system.order.domain.ClearOrder;
+import com.xingxi.order.domain.ClearOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
  * 清算订单信息Service业务层处理
- * 
- * @author biandan
- * @date 2022-02-23
+ *
+ * @author xingxi
+ * @date 2025-02-11
  */
 @Service
-public class ClearOrderVoServiceImpl implements IClearOrderVoService
-{
+public class ClearOrderVoServiceImpl implements IClearOrderVoService {
     @Autowired
     private ClearOrderVoMapper clearOrderVoMapper;
 
@@ -25,8 +24,7 @@ public class ClearOrderVoServiceImpl implements IClearOrderVoService
      * @return 结果
      */
     @Override
-    public int syncOrderStatusByOrderId(ClearOrder clearOrder)
-    {
+    public int syncOrderStatusByOrderId(ClearOrder clearOrder) {
         return clearOrderVoMapper.syncOrderStatusByOrderId(clearOrder);
     }
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/impl/CommissionOrderDetailVoServiceImpl.java

@@ -1,33 +0,0 @@
-package com.xingxi.mq.server.order.service.impl;
-
-import com.xingxi.mq.server.order.mapper.CommissionOrderDetailVoMapper;
-import com.xingxi.mq.server.order.service.ICommissionOrderDetailVoService;
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrderDetail;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 推广者佣金订单详细信息Service业务层处理
- * 
- * @author biandan
- * @date 2022-02-23
- */
-@Service
-public class CommissionOrderDetailVoServiceImpl implements ICommissionOrderDetailVoService
-{
-    @Autowired
-    private CommissionOrderDetailVoMapper commissionOrderDetailVoMapper;
-
-    /**
-     * 修改推广者佣金订单详细信息
-     *
-     * @param commissionOrderDetail 推广者佣金订单详细信息
-     * @return 结果
-     */
-    @Override
-    public int updateCommissionOrderDetailVo(CommissionOrderDetail commissionOrderDetail)
-    {
-        return commissionOrderDetailVoMapper.updateCommissionOrderDetailVo(commissionOrderDetail);
-    }
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/impl/CommissionOrderVoServiceImpl.java

@@ -1,44 +0,0 @@
-package com.xingxi.mq.server.order.service.impl;
-
-import com.xingxi.mq.server.order.mapper.CommissionOrderVoMapper;
-import com.xingxi.mq.server.order.service.ICommissionOrderVoService;
-import cn.com.wingxi.biandan.system.order.domain.CommissionOrder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 推广者佣金订单信息Service业务层处理
- * 
- * @author biandan
- * @date 2022-02-23
- */
-@Service
-public class CommissionOrderVoServiceImpl implements ICommissionOrderVoService
-{
-    @Autowired
-    private CommissionOrderVoMapper commissionOrderVoMapper;
-
-    /**
-     * 修改推广者佣金订单信息
-     *
-     * @param commissionOrder 推广者佣金订单信息
-     * @return 结果
-     */
-    @Override
-    public int updateCommissionOrderVo(CommissionOrder commissionOrder)
-    {
-        return commissionOrderVoMapper.updateCommissionOrderVo(commissionOrder);
-    }
-
-    /**
-     * 修改推广者佣金订单信息
-     *
-     * @param commissionOrder 推广者佣金订单信息
-     * @return 结果
-     */
-    @Override
-    public int syncOrderStatusByOrderId(CommissionOrder commissionOrder)
-    {
-        return commissionOrderVoMapper.syncOrderStatusByOrderId(commissionOrder);
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/impl/InvoiceOrderMqServiceImpl.java

@@ -1,32 +0,0 @@
-package com.xingxi.mq.server.order.service.impl;
-
-import com.xingxi.mq.server.order.mapper.InvoiceOrderMqMapper;
-import com.xingxi.mq.server.order.service.IInvoiceOrderMqService;
-import cn.com.wingxi.biandan.system.order.domain.InvoiceOrder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 发票订单信息Service业务层处理
- * 
- * @author biandan
- * @date 2022-04-02
- */
-@Service
-public class InvoiceOrderMqServiceImpl implements IInvoiceOrderMqService
-{
-    @Autowired
-    private InvoiceOrderMqMapper invoiceOrderMqMapper;
-
-    /**
-     * 修改发票订单信息
-     * 
-     * @param invoiceOrder 发票订单信息
-     * @return 结果
-     */
-    @Override
-    public int updateInvoiceOrderReturnQty(InvoiceOrder invoiceOrder)
-    {
-        return invoiceOrderMqMapper.updateInvoiceOrderReturnQty(invoiceOrder);
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/impl/OrderDetailVoServiceImpl.java

@@ -2,29 +2,28 @@ package com.xingxi.mq.server.order.service.impl;
 
 import com.xingxi.mq.server.order.mapper.OrderDetailMqMapper;
 import com.xingxi.mq.server.order.service.IOrderDetailVoService;
-import cn.com.wingxi.biandan.system.order.domain.OrderDetail;
+import com.xingxi.order.domain.OrderDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
  * 订单明细Service业务层处理
- * 
- * @author biandan
- * @date 2022-02-23
+ *
+ * @author xingxi
+ * @date 2025-02-11
  */
 @Service
-public class OrderDetailVoServiceImpl implements IOrderDetailVoService
-{
+public class OrderDetailVoServiceImpl implements IOrderDetailVoService {
     @Autowired
     private OrderDetailMqMapper orderDetailVoMapper;
 
     /**
      * 校验订单是否完成
      *
-     * @param orderId
-     * @return
+     * @param orderId 订单ID
+     * @return 检查结果
      */
-    public int checkOrderFinished(Long orderId){
+    public int checkOrderFinished(Long orderId) {
         return orderDetailVoMapper.checkOrderFinished(orderId);
     }
 
@@ -35,9 +34,7 @@ public class OrderDetailVoServiceImpl implements IOrderDetailVoService
      * @return 订单详细信息Vo集合
      */
     @Override
-    public int updateReturnQty(OrderDetail orderDetail)
-    {
+    public int updateReturnQty(OrderDetail orderDetail) {
         return orderDetailVoMapper.updateReturnQty(orderDetail);
     }
-
 }

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/order/service/impl/PaymentInfoMqServiceImpl.java

@@ -1,32 +0,0 @@
-package com.xingxi.mq.server.order.service.impl;
-
-import com.xingxi.mq.server.order.mapper.PaymentInfoMqMapper;
-import com.xingxi.mq.server.order.service.IPaymentInfoMqService;
-import cn.com.wingxi.biandan.system.order.domain.PaymentInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 订单明细Service业务层处理
- * 
- * @author biandan
- * @date 2022-02-23
- */
-@Service
-public class PaymentInfoMqServiceImpl implements IPaymentInfoMqService
-{
-    @Autowired
-    private PaymentInfoMqMapper paymentInfoMqMapper;
-
-    /**
-     * 修改支付信息
-     *
-     * @param paymentInfo 支付信息
-     * @return 结果
-     */
-    @Override
-    public int updateOrderStatusByOrderId(PaymentInfo paymentInfo)
-    {
-        return paymentInfoMqMapper.updateOrderStatusByOrderId(paymentInfo);
-    }
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/product/domain/ProdMateMq.java

@@ -1,22 +0,0 @@
-package com.xingxi.mq.server.product.domain;
-
-import cn.com.wingxi.biandan.system.product.domain.ProdMate;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品素材对象 m_prod_mate
- * 
- * @author biandan
- * @date 2022-04-01
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdMateMq extends ProdMate
-{
-    private static final long serialVersionUID = 1L;
-
-    private String mateName;
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/product/domain/ProdStockVo.java

@@ -1,41 +0,0 @@
-package com.xingxi.mq.server.product.domain;
-
-import cn.com.wingxi.biandan.system.product.domain.ProdStock;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-/**
- * 商品库存对象 t_prod_stockVo
- * 
- * @author biandan
- * @date 2022-02-23
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@ToString
-public class ProdStockVo extends ProdStock
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 商品分类 */
-    private Long prodkindId;
-
-    /** 商品分类 */
-    private String prodkindName;
-
-    /** 商品名称 */
-    private String prodName;
-
-    /** 属性组合名称 */
-    private String pprName;
-
-    /** 流水类型 */
-    private String billType;
-
-    /** 流水分类 */
-    private String billKind;
-
-    private Long orderId;
-    private String orderNo;
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/product/mapper/ProdMateMqMapper.java

@@ -1,33 +0,0 @@
-package com.xingxi.mq.server.product.mapper;
-
-import com.xingxi.mq.server.product.domain.ProdMateMq;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 商品素材Mapper接口
- *
- * @author biandan
- * @date 2022-04-01
- */
-@Repository
-public interface ProdMateMqMapper {
-    /**
-     * 查询商品素材列表
-     *
-     * @param prodMateMq 商品素材
-     * @return 商品素材集合
-     */
-    public List<ProdMateMq> selectProdMateUnitQty(ProdMateMq prodMateMq);
-
-    /**
-     * 查询商品固化时设计面数量
-     *
-     * @param prodId 商品Id
-     * @param pprId  商品属性Id
-     * @return 商品素材集合
-     */
-    public int selectProdMateSurfaceQty(@Param("prodId") Long prodId, @Param("pprId") Long pprId);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/product/mapper/ProdPriceMqMapper.java

@@ -1,26 +0,0 @@
-package com.xingxi.mq.server.product.mapper;
-
-import cn.com.wingxi.biandan.system.product.domain.ProdPrice;
-import org.springframework.stereotype.Repository;
-
-import java.math.BigDecimal;
-
-/**
- * 商品价格Mapper接口
- * 
- * @author biandan
- * @date 2022-02-23
- */
-@Repository
-public interface ProdPriceMqMapper
-{
-
-    /**
-     * 查询商品价格
-     *
-     * @param prodPrice 商品
-     * @return 商品价格
-     */
-    public BigDecimal getProdPriceByUnionId(ProdPrice prodPrice);
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/product/mapper/ProdStockVoMapper.java

@@ -1,57 +0,0 @@
-package com.xingxi.mq.server.product.mapper;
-
-import com.xingxi.mq.server.product.domain.ProdStockVo;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-/**
- * 商品库存Mapper接口
- * 
- * @author biandan
- * @date 2022-02-23
- */
-@Repository
-public interface ProdStockVoMapper
-{
-
-    /**
-     * 查询商品库存
-     *
-     * @param stockId 商品库存主键
-     * @return 商品库存Vo
-     */
-    public ProdStockVo selectProdStockVoByStockId(Long stockId);
-
-    /**
-     * 查询商品库存列表
-     *
-     * @param prodStockVo 商品库存
-     * @return 商品库存Vo集合
-     */
-    public List<ProdStockVo> selectProdStockVoList(ProdStockVo prodStockVo);
-
-    /**
-     * 查询商品库存
-     *
-     * @param prodStockVo 商品主键
-     * @return 商品库存Vo
-     */
-    public ProdStockVo selectProdStockVoByUnionId(ProdStockVo prodStockVo);
-
-    /**
-     * 更新库存
-     *
-     * @param prodStockVo
-     * @return
-     */
-    public int updateProdStockQty(ProdStockVo prodStockVo);
-
-    /**
-     * 更新库存
-     *
-     * @param prodStockVo
-     * @return
-     */
-    public int updateProdStockQtyByUnionId(ProdStockVo prodStockVo);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/product/service/IProdMateMqService.java

@@ -1,35 +0,0 @@
-package com.xingxi.mq.server.product.service;
-
-import com.xingxi.mq.server.product.domain.ProdMateMq;
-
-import java.util.List;
-
-/**
- * 商品素材Service接口
- * 
- * @author biandan
- * @date 2022-04-01
- */
-public interface IProdMateMqService
-{
-    /**
-     * 查询商品素材单位数量列表
-     *
-     * @param prodId 商品Id
-     * @param pprId 商品属性Id
-     *
-     * @return 商品素材集合
-     */
-    public List<ProdMateMq> selectProdMateUnitQty(Long prodId, Long pprId);
-
-    /**
-     * 查询商品固化时设计面数量
-     *
-     * @param prodId 商品Id
-     * @param pprId 商品属性Id
-     *
-     * @return 商品素材集合
-     */
-    public int selectProdMateSurfaceQty(Long prodId, Long pprId);
-
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/product/service/IProdPriceMqService.java

@@ -1,22 +0,0 @@
-package com.xingxi.mq.server.product.service;
-
-import cn.com.wingxi.biandan.system.product.domain.ProdPrice;
-
-import java.math.BigDecimal;
-
-/**
- * 商品价格VoService接口
- * 
- * @author biandan
- * @date 2022-02-18
- */
-public interface IProdPriceMqService
-{
-    /**
-     * 查询商品价格
-     *
-     * @param prodPrice 商品
-     * @return 商品价格
-     */
-    public BigDecimal getProdPriceByUnionId(ProdPrice prodPrice);
-}

08.src/Xingxi/xingxi-mq-server/src/main/java/com/xingxi/mq/server/product/service/IProdStockVoService.java

@@ -1,56 +0,0 @@
-package com.xingxi.mq.server.product.service;
-
-import com.xingxi.mq.server.product.domain.ProdStockVo;
-
-import java.util.List;
-
-/**
- * 商品库存VoService接口
- * 
- * @author biandan
- * @date 2022-02-23
- */
-public interface IProdStockVoService
-{
-
-    /**
-     * 查询商品库存
-     *
-     * @param stockId 商品库存主键
-     * @return 商品库存Vo
-     */
-    public ProdStockVo selectProdStockVoByStockId(Long stockId);
-
-    /**
-     * 查询商品库存
-     *
-     * @param prodStockVo 商品库存主键
-     * @return 商品库存Vo
-     */
-    public ProdStockVo selectProdStockVoByUnionId(ProdStockVo prodStockVo);
-
-    /**
-     * 查询商品库存列表
-     *
-     * @param prodStockVo 商品库存
-     * @return 商品库存Vo集合
-     */
-    public List<ProdStockVo> selectProdStockVoList(ProdStockVo prodStockVo);
-
-    /**
-     * 新增商品库存
-     *
-     * @param prodStock 商品库存
-     * @return 结果
-     */
-    public int insertProdStockVo(ProdStockVo prodStock);
-
-    /**
-     * 更新库存
-     *
-     * @param prodStockVo
-     * @return
-     */
-    public int updateProdStockQty(ProdStockVo prodStockVo);
-
-}