修改编译错误

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

@@ -16,7 +16,6 @@
     </description>
 
     <dependencies>
-
         <!-- SpringBoot集成thymeleaf模板 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -75,6 +74,7 @@
     </dependencies>
 
     <build>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
@@ -134,7 +134,25 @@
                 </configuration>
             </plugin> -->
         </plugins>
-        <finalName>${project.artifactId}</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/**</include>
+                </includes>
+                <!--不加这个就会报错，对于多配置文件的这种，必须设成true-->
+                <filtering>true</filtering>
+            </resource>
+        </resources>
     </build>
 
+    <repositories>
+        <repository>
+            <id>aliyunmaven</id>
+            <url>https://maven.aliyun.com/repository/public/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
 </project>

08.src/Xingxi/xingxi-admin/src/main/resources/application-local.yml

@@ -15,9 +15,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.98.241.144:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: password
+                url: jdbc:mysql://47.99.85.139:3306/GoodsMarket?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: gululuq
+                password: f^*n%QfvekP!0Rur
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -67,4 +67,7 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
+idworkcfg:
+    workerId: "2"
+    dataCenterId: "2"

08.src/Xingxi/xingxi-admin/src/main/resources/application.yml

@@ -59,7 +59,7 @@ spring:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
   profiles:
-    active: druid
+    active: @env@
   # 文件上传
   servlet:
     multipart:

08.src/Xingxi/xingxi-admin/src/main/resources/static/js/three.min.js

@@ -50,7 +50,7 @@ e);b[9]=d-g;b[2]=c-h;b[6]=d+g;b[10]=1-(a+l);return this},compose:function(a,b,c)
 b instanceof THREE.Quaternion?b:new THREE.Quaternion;c=c instanceof THREE.Vector3?c:new THREE.Vector3;c.x=e.length();c.y=f.length();c.z=g.length();a.x=d[12];a.y=d[13];a.z=d[14];d=THREE.Matrix4.__m1;d.copy(this);d.elements[0]/=c.x;d.elements[1]/=c.x;d.elements[2]/=c.x;d.elements[4]/=c.y;d.elements[5]/=c.y;d.elements[6]/=c.y;d.elements[8]/=c.z;d.elements[9]/=c.z;d.elements[10]/=c.z;b.setFromRotationMatrix(d);return[a,b,c]},extractPosition:function(a){var b=this.elements,a=a.elements;b[12]=a[12];b[13]=
 a[13];b[14]=a[14];return this},extractRotation:function(a){var b=this.elements,a=a.elements,c=THREE.Matrix4.__v1,d=1/c.set(a[0],a[1],a[2]).length(),e=1/c.set(a[4],a[5],a[6]).length(),c=1/c.set(a[8],a[9],a[10]).length();b[0]=a[0]*d;b[1]=a[1]*d;b[2]=a[2]*d;b[4]=a[4]*e;b[5]=a[5]*e;b[6]=a[6]*e;b[8]=a[8]*c;b[9]=a[9]*c;b[10]=a[10]*c;return this},translate:function(a){var b=this.elements,c=a.x,d=a.y,a=a.z;b[12]=b[0]*c+b[4]*d+b[8]*a+b[12];b[13]=b[1]*c+b[5]*d+b[9]*a+b[13];b[14]=b[2]*c+b[6]*d+b[10]*a+b[14];
 b[15]=b[3]*c+b[7]*d+b[11]*a+b[15];return this},rotateX:function(a){var b=this.elements,c=b[4],d=b[5],e=b[6],f=b[7],g=b[8],h=b[9],i=b[10],j=b[11],l=Math.cos(a),a=Math.sin(a);b[4]=l*c+a*g;b[5]=l*d+a*h;b[6]=l*e+a*i;b[7]=l*f+a*j;b[8]=l*g-a*c;b[9]=l*h-a*d;b[10]=l*i-a*e;b[11]=l*j-a*f;return this},rotateY:function(a){var b=this.elements,c=b[0],d=b[1],e=b[2],f=b[3],g=b[8],h=b[9],i=b[10],j=b[11],l=Math.cos(a),a=Math.sin(a);b[0]=l*c-a*g;b[1]=l*d-a*h;b[2]=l*e-a*i;b[3]=l*f-a*j;b[8]=l*g+a*c;b[9]=l*h+a*d;b[10]=
-l*i+a*e;b[11]=l*j+a*f;return this},rotateZ:function(a){var b=this.elements,c=b[0],d=b[1],e=b[2],f=b[3],g=b[4],h=b[5],i=b[6],j=b[7],l=Math.cos(a),a=Math.sin(a);b[0]=l*c+a*g;b[1]=l*d+a*h;b[2]=l*e+a*i;b[3]=l*f+a*j;b[4]=l*g-a*c;b[5]=l*h-a*d;b[6]=l*i-a*e;b[7]=l*j-a*f;return this},rotateByAxis:function(a,b){var c=this.elements;if(1===a.x&&0===a.y&&0===a.z)return this.rotateX(b);if(0===a.x&&1===a.y&&0===a.z)return this.rotateY(b);if(0===a.x&&0===a.y&&1===a.z)return this.rotateZ(b);var d=a.x,e=a.y,f=a.z,
+l*i+a*e;b[11]=l*j+a*f;return this},rotateZ:function(a){var b=this.elements,c=b[0],d=b[1],e=b[2],f=b[3],g=b[4],h=b[5],i=b[6],j=b[7],l=Math.cos(a),a=Math.sin(a);b[0]=l*c+a*g;b[1]=l*d+a*h;b[2]=l*e+a*i;b[3]=l*f+a*j;b[4]=l*g-a*c;b[5]=l*h-a*d;b[6]=l*i-a*e;b[7]=l*j-a*f;return this},rotateUserAxis:function(a,b){var c=this.elements;if(1===a.x&&0===a.y&&0===a.z)return this.rotateX(b);if(0===a.x&&1===a.y&&0===a.z)return this.rotateY(b);if(0===a.x&&0===a.y&&1===a.z)return this.rotateZ(b);var d=a.x,e=a.y,f=a.z,
 g=Math.sqrt(d*d+e*e+f*f),d=d/g,e=e/g,f=f/g,g=d*d,h=e*e,i=f*f,j=Math.cos(b),l=Math.sin(b),m=1-j,n=d*e*m,p=d*f*m,m=e*f*m,d=d*l,o=e*l,l=f*l,f=g+(1-g)*j,g=n+l,e=p-o,n=n-l,h=h+(1-h)*j,l=m+d,p=p+o,m=m-d,i=i+(1-i)*j,j=c[0],d=c[1],o=c[2],s=c[3],t=c[4],r=c[5],z=c[6],w=c[7],q=c[8],E=c[9],A=c[10],v=c[11];c[0]=f*j+g*t+e*q;c[1]=f*d+g*r+e*E;c[2]=f*o+g*z+e*A;c[3]=f*s+g*w+e*v;c[4]=n*j+h*t+l*q;c[5]=n*d+h*r+l*E;c[6]=n*o+h*z+l*A;c[7]=n*s+h*w+l*v;c[8]=p*j+m*t+i*q;c[9]=p*d+m*r+i*E;c[10]=p*o+m*z+i*A;c[11]=p*s+m*w+i*v;
 return this},scale:function(a){var b=this.elements,c=a.x,d=a.y,a=a.z;b[0]*=c;b[4]*=d;b[8]*=a;b[1]*=c;b[5]*=d;b[9]*=a;b[2]*=c;b[6]*=d;b[10]*=a;b[3]*=c;b[7]*=d;b[11]*=a;return this},getMaxScaleOnAxis:function(){var a=this.elements;return Math.sqrt(Math.max(a[0]*a[0]+a[1]*a[1]+a[2]*a[2],Math.max(a[4]*a[4]+a[5]*a[5]+a[6]*a[6],a[8]*a[8]+a[9]*a[9]+a[10]*a[10])))},makeTranslation:function(a,b,c){this.set(1,0,0,a,0,1,0,b,0,0,1,c,0,0,0,1);return this},makeRotationX:function(a){var b=Math.cos(a),a=Math.sin(a);
 this.set(1,0,0,0,0,b,-a,0,0,a,b,0,0,0,0,1);return this},makeRotationY:function(a){var b=Math.cos(a),a=Math.sin(a);this.set(b,0,a,0,0,1,0,0,-a,0,b,0,0,0,0,1);return this},makeRotationZ:function(a){var b=Math.cos(a),a=Math.sin(a);this.set(b,-a,0,0,a,b,0,0,0,0,1,0,0,0,0,1);return this},makeRotationAxis:function(a,b){var c=Math.cos(b),d=Math.sin(b),e=1-c,f=a.x,g=a.y,h=a.z,i=e*f,j=e*g;this.set(i*f+c,i*g-d*h,i*h+d*g,0,i*g+d*h,j*g+c,j*h-d*f,0,i*h-d*g,j*h+d*f,e*h*h+c,0,0,0,0,1);return this},makeScale:function(a,

08.src/Xingxi/xingxi-admin/src/main/resources/templates/demo/table/curd.html

@@ -143,7 +143,7 @@
         /* 修改行ID值为1的数据 */
         function updateRowByUniqueId(){
         	var randomId = 100 + ~~(Math.random() * 100)
-        	$("#" + table.options.id).bootstrapTable('updateByUniqueId', {
+        	$("#" + table.options.id).bootstrapTable('updateUserUniqueId', {
         		id: 1,
                 row: {
                 	userId: randomId,

08.src/Xingxi/xingxi-admin/src/main/resources/templates/system/notice/notice.html

@@ -14,7 +14,7 @@
 								公告标题：<input type="text" name="noticeTitle"/>
 							</li>
 							<li>
-								操作人员：<input type="text" name="createBy"/>
+								操作人员：<input type="text" name="createUser"/>
 							</li>
 							<li>
 								公告类型：<select name="noticeType" th:with="type=${@dict.getType('sys_notice_type')}">
@@ -95,7 +95,7 @@
 		            }
 		        },
 				{
-					field : 'createBy', 
+					field : 'createUser',
 					title : '创建者' 
 				},
 				{

08.src/Xingxi/xingxi-admin/src/main/resources/templates/system/notice/view.html

@@ -12,7 +12,7 @@
                         <h3 style="text-align: center">[[${notice.noticeTitle}]]</h3>
                         <h5>
                           <span class="pull-right font-noraml">发送时间：[[${#dates.format(notice.createTime, 'yyyy-MM-dd HH:mm:ss')}]] </span>
-                          <span class="font-noraml">发件人： </span>[[${notice.createBy}]]
+                          <span class="font-noraml">发件人： </span>[[${notice.createUser}]]
                         </h5>
                     </div>
                 </div>

08.src/Xingxi/xingxi-admin/src/main/resources/templates/system/user/view.html

@@ -95,7 +95,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">创建者：</label>
                         <div class="col-sm-8">
-                            <p class="form-control-plaintext" th:text="*{createBy}"></p>
+                            <p class="form-control-plaintext" th:text="*{createUser}"></p>
                         </div>
                     </div>
                 </div>
@@ -113,7 +113,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">更新者：</label>
                         <div class="col-sm-8">
-                            <p class="form-control-plaintext" th:text="*{updateBy}"></p>
+                            <p class="form-control-plaintext" th:text="*{updateUser}"></p>
                         </div>
                     </div>
                 </div>

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

@@ -1,211 +1,211 @@
-package com.xingxi.common.aliyun.oss;
-
-import com.aliyun.oss.OSS;
-import com.aliyun.oss.internal.OSSConstants;
-import com.aliyun.oss.model.CannedAccessControlList;
-import com.aliyun.oss.model.OSSObject;
-import com.aliyun.oss.model.PutObjectResult;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.io.InputStream;
-
-@Slf4j
-@Component
-public class DefaultAliyunOSSClient implements AliyunOSSClient {
-    @Resource
-    private OSS ossClient;
-
-    @Value("${aliyun.oss.bucketName}")
-    private String bucketName;
-
-    @Value("${aliyun.oss.customDomain}")
-    private String customDomain;
-
-    /**
-     * 桶子如果不存在就创建
-     *
-     * @param bucketName
-     * @throws Exception
-     */
-    @Override
-    public void createBucket(String bucketName) throws Exception {
-        if (!ossClient.doesBucketExist(bucketName)) {
-            ossClient.createBucket(bucketName);
-        }
-    }
-
-    /**
-     * 上传文件到指定桶子,默认公共读取
-     *
-     * @param bucketName
-     * @param objectName
-     * @param inputStream
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public String putObject(String bucketName, String objectName, InputStream inputStream) throws Exception {
-        return putObject(bucketName, objectName, inputStream, CannedAccessControlList.PublicRead);
-    }
-
-    /**
-     * 上传文件
-     *
-     * @param bucketName
-     * @param objectName
-     * @param inputStream
-     * @param cannedAccessControlList
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public String putObject(String bucketName, String objectName, InputStream inputStream, CannedAccessControlList cannedAccessControlList) throws Exception {
-
-        log.info("OSS上传文件,bucketName={},objectName={},ObjectAcl={}", bucketName, objectName, cannedAccessControlList);
-        // 创建桶子
-        createBucket(bucketName);
-
-        PutObjectResult putObjectResult = null;
-        try {
-            // 上传文件
-            putObjectResult = ossClient.putObject(bucketName, objectName, inputStream);
-            // 设置文件Acl权限
-            ossClient.setObjectAcl(bucketName, objectName, cannedAccessControlList);
-        } finally {
-
-            if (putObjectResult != null && putObjectResult.getResponse() != null) {
-                putObjectResult.getResponse().close();
-            }
-
-            if (inputStream != null) {
-                inputStream.close();
-            }
-        }
-
-        // 构建返回url
-        String url = OSSConstants.PROTOCOL_HTTPS + bucketName + "." + getProfile().getEndPoint() + "/" + objectName;
-        // 如果自定义域名
-        if (getProfile().getCustomDomain() != null) {
-            // 转换自定义域名
-            url = OSSConstants.PROTOCOL_HTTPS + getProfile().getCustomDomain() + "/" + objectName;
-        }
-
-        log.info("URL=[{}]", url);
-        // 返回
-        return url;
-
-    }
-
-    /**
-     * 上传文件到默认桶子
-     *
-     * @param objectName
-     * @param inputStream
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public String putObject(String objectName, InputStream inputStream) throws Exception {
-        return putObject(getProfile().getBucketName(), objectName, inputStream);
-    }
-
-
-    /**
-     * 默认上传default bucket
-     *
-     * @param objectName
-     * @param inputStream
-     * @param cannedAccessControlList
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public String putObject(String objectName, InputStream inputStream, CannedAccessControlList cannedAccessControlList) throws Exception {
-        return putObject(getProfile().getBucketName(), objectName, inputStream, cannedAccessControlList);
-    }
-
-    /**
-     * 取得指定桶子中的文件
-     *
-     * @param bucketName
-     * @param objectName
-     * @return
-     */
-    @Override
-    public OSSObject getObject(String bucketName, String objectName) {
-        log.info("获取oss文件,bucketName={},objectName={}", bucketName, objectName);
-        if (ossClient.doesObjectExist(bucketName, objectName)) {
-            return ossClient.getObject(bucketName, objectName);
-        }
-        return null;
-    }
-
-    @Override
-    public boolean doesObjectExist(String objectName) throws Exception {
-        return ossClient.doesObjectExist(bucketName, objectName);
-    }
-
-    /**
-     * 取得默认桶子中的文件
-     *
-     * @param objectName
-     * @return
-     * @throws Exception
-     */
-    @Override
-    public OSSObject getObject(String objectName) throws Exception {
-        return getObject(getProfile().getBucketName(), objectName);
-    }
-
-    /**
-     * 删除指定桶子中的文件
-     *
-     * @param bucketName
-     * @param objectName
-     * @throws Exception
-     */
-    @Override
-    public void removeObject(String bucketName, String objectName) throws Exception {
-        if (ossClient.doesObjectExist(bucketName, objectName)) {
-            ossClient.deleteObject(bucketName, objectName);
-        }
-    }
-
-    /**
-     * 取得配置文件信息
-     *
-     * @return
-     */
-    @Override
-    public AliyunOSSProfile getProfile() {
-        return new AliyunOSSProfile() {
-            @Override
-            public String getEndPoint() {
-                return null;
-            }
-
-            @Override
-            public String getAccessKeyID() {
-                return null;
-            }
-
-            @Override
-            public String getAccessKeySecret() {
-                return null;
-            }
-
-            @Override
-            public String getBucketName() {
-                return bucketName;
-            }
-
-            @Override
-            public String getCustomDomain() {
-                return customDomain;
-            }
-        };
-    }
-}
+//package com.xingxi.common.aliyun.oss;
+//
+//import com.aliyun.oss.OSS;
+//import com.aliyun.oss.internal.OSSConstants;
+//import com.aliyun.oss.model.CannedAccessControlList;
+//import com.aliyun.oss.model.OSSObject;
+//import com.aliyun.oss.model.PutObjectResult;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.stereotype.Component;
+//
+//import javax.annotation.Resource;
+//import java.io.InputStream;
+//
+//@Slf4j
+//@Component
+//public class DefaultAliyunOSSClient implements AliyunOSSClient {
+//    @Resource
+//    private OSS ossClient;
+//
+//    @Value("${aliyun.oss.bucketName}")
+//    private String bucketName;
+//
+//    @Value("${aliyun.oss.customDomain}")
+//    private String customDomain;
+//
+//    /**
+//     * 桶子如果不存在就创建
+//     *
+//     * @param bucketName
+//     * @throws Exception
+//     */
+//    @Override
+//    public void createBucket(String bucketName) throws Exception {
+//        if (!ossClient.doesBucketExist(bucketName)) {
+//            ossClient.createBucket(bucketName);
+//        }
+//    }
+//
+//    /**
+//     * 上传文件到指定桶子,默认公共读取
+//     *
+//     * @param bucketName
+//     * @param objectName
+//     * @param inputStream
+//     * @return
+//     * @throws Exception
+//     */
+//    @Override
+//    public String putObject(String bucketName, String objectName, InputStream inputStream) throws Exception {
+//        return putObject(bucketName, objectName, inputStream, CannedAccessControlList.PublicRead);
+//    }
+//
+//    /**
+//     * 上传文件
+//     *
+//     * @param bucketName
+//     * @param objectName
+//     * @param inputStream
+//     * @param cannedAccessControlList
+//     * @return
+//     * @throws Exception
+//     */
+//    @Override
+//    public String putObject(String bucketName, String objectName, InputStream inputStream, CannedAccessControlList cannedAccessControlList) throws Exception {
+//
+//        log.info("OSS上传文件,bucketName={},objectName={},ObjectAcl={}", bucketName, objectName, cannedAccessControlList);
+//        // 创建桶子
+//        createBucket(bucketName);
+//
+//        PutObjectResult putObjectResult = null;
+//        try {
+//            // 上传文件
+//            putObjectResult = ossClient.putObject(bucketName, objectName, inputStream);
+//            // 设置文件Acl权限
+//            ossClient.setObjectAcl(bucketName, objectName, cannedAccessControlList);
+//        } finally {
+//
+//            if (putObjectResult != null && putObjectResult.getResponse() != null) {
+//                putObjectResult.getResponse().close();
+//            }
+//
+//            if (inputStream != null) {
+//                inputStream.close();
+//            }
+//        }
+//
+//        // 构建返回url
+//        String url = OSSConstants.PROTOCOL_HTTPS + bucketName + "." + getProfile().getEndPoint() + "/" + objectName;
+//        // 如果自定义域名
+//        if (getProfile().getCustomDomain() != null) {
+//            // 转换自定义域名
+//            url = OSSConstants.PROTOCOL_HTTPS + getProfile().getCustomDomain() + "/" + objectName;
+//        }
+//
+//        log.info("URL=[{}]", url);
+//        // 返回
+//        return url;
+//
+//    }
+//
+//    /**
+//     * 上传文件到默认桶子
+//     *
+//     * @param objectName
+//     * @param inputStream
+//     * @return
+//     * @throws Exception
+//     */
+//    @Override
+//    public String putObject(String objectName, InputStream inputStream) throws Exception {
+//        return putObject(getProfile().getBucketName(), objectName, inputStream);
+//    }
+//
+//
+//    /**
+//     * 默认上传default bucket
+//     *
+//     * @param objectName
+//     * @param inputStream
+//     * @param cannedAccessControlList
+//     * @return
+//     * @throws Exception
+//     */
+//    @Override
+//    public String putObject(String objectName, InputStream inputStream, CannedAccessControlList cannedAccessControlList) throws Exception {
+//        return putObject(getProfile().getBucketName(), objectName, inputStream, cannedAccessControlList);
+//    }
+//
+//    /**
+//     * 取得指定桶子中的文件
+//     *
+//     * @param bucketName
+//     * @param objectName
+//     * @return
+//     */
+//    @Override
+//    public OSSObject getObject(String bucketName, String objectName) {
+//        log.info("获取oss文件,bucketName={},objectName={}", bucketName, objectName);
+//        if (ossClient.doesObjectExist(bucketName, objectName)) {
+//            return ossClient.getObject(bucketName, objectName);
+//        }
+//        return null;
+//    }
+//
+//    @Override
+//    public boolean doesObjectExist(String objectName) throws Exception {
+//        return ossClient.doesObjectExist(bucketName, objectName);
+//    }
+//
+//    /**
+//     * 取得默认桶子中的文件
+//     *
+//     * @param objectName
+//     * @return
+//     * @throws Exception
+//     */
+//    @Override
+//    public OSSObject getObject(String objectName) throws Exception {
+//        return getObject(getProfile().getBucketName(), objectName);
+//    }
+//
+//    /**
+//     * 删除指定桶子中的文件
+//     *
+//     * @param bucketName
+//     * @param objectName
+//     * @throws Exception
+//     */
+//    @Override
+//    public void removeObject(String bucketName, String objectName) throws Exception {
+//        if (ossClient.doesObjectExist(bucketName, objectName)) {
+//            ossClient.deleteObject(bucketName, objectName);
+//        }
+//    }
+//
+//    /**
+//     * 取得配置文件信息
+//     *
+//     * @return
+//     */
+//    @Override
+//    public AliyunOSSProfile getProfile() {
+//        return new AliyunOSSProfile() {
+//            @Override
+//            public String getEndPoint() {
+//                return null;
+//            }
+//
+//            @Override
+//            public String getAccessKeyID() {
+//                return null;
+//            }
+//
+//            @Override
+//            public String getAccessKeySecret() {
+//                return null;
+//            }
+//
+//            @Override
+//            public String getBucketName() {
+//                return bucketName;
+//            }
+//
+//            @Override
+//            public String getCustomDomain() {
+//                return customDomain;
+//            }
+//        };
+//    }
+//}

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/config/AliyunOSSConfig.java

@@ -6,8 +6,7 @@ import com.aliyun.oss.OSSClientBuilder;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
-@Configuration
+//@Configuration
 public class AliyunOSSConfig {
 
     @Value("${aliyun.oss.endPoint}")

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/config/IdWorkCfg.java

@@ -10,7 +10,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.Assert;
 
-
 @Data
 @Configuration
 @EnableConfigurationProperties(IdWorkCfg.class)

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/constant/GenConstants.java

@@ -56,7 +56,7 @@ public class GenConstants
             "update_time", "remark" };
 
     /** Entity基类字段 */
-    public static final String[] BASE_ENTITY = { "createBy", "createTime", "updateBy", "updateTime", "remark" };
+    public static final String[] BASE_ENTITY = { "createUser", "createTime", "updateUser", "updateTime", "remark" };
 
     /** Tree基类字段 */
     public static final String[] TREE_ENTITY = { "parentName", "parentId", "orderNum", "ancestors" };

08.src/Xingxi/xingxi-common/src/main/java/com/xingxi/common/mq/constant/OrderMqKey.java

@@ -8,175 +8,174 @@ package com.xingxi.common.mq.constant;
  * @Date 2020/9/15 15:51
  * @Version 1.0
  **/
-
 public interface OrderMqKey {
 
     /**
      * 订单消息交换机
      */
-    String EDIT_EXCHANGE = "mq.exchange.topic.biandan.order";
+    String EDIT_EXCHANGE = "mq.exchange.topic.xingxi.order";
 
     /**
      *  订单生成路由KEY
      */
-    String EDIT_ROUTE_FOR_CREATED = "mq.route.biandan.order.created";
+    String EDIT_ROUTE_FOR_CREATED = "mq.route.xingxi.order.created";
 
     /**
      *  支付完成路由KEY
      */
-    String EDIT_ROUTE_FOR_PAYED = "mq.route.biandan.order.payed";
+    String EDIT_ROUTE_FOR_PAYED = "mq.route.xingxi.order.payed";
 
     /**
      * 取消路由KEY
      */
-    String EDIT_ROUTE_FOR_CANCELED = "mq.route.biandan.order.canceled";
+    String EDIT_ROUTE_FOR_CANCELED = "mq.route.xingxi.order.canceled";
 
     /**
      * 发货路由KEY
      */
-    String EDIT_ROUTE_FOR_DELIVERED = "mq.route.biandan.order.delivered";
+    String EDIT_ROUTE_FOR_DELIVERED = "mq.route.xingxi.order.delivered";
 
     /**
      * 发货取消路由KEY
      */
-    String EDIT_ROUTE_FOR_DELIVERY_CANCELED = "mq.route.biandan.order.delivery.canceled";
+    String EDIT_ROUTE_FOR_DELIVERY_CANCELED = "mq.route.xingxi.order.delivery.canceled";
 
     /**
      * 订单售后路由KEY
      */
-    String EDIT_ROUTE_FOR_AFTER_SALE = "mq.route.biandan.order.after.sale";
+    String EDIT_ROUTE_FOR_AFTER_SALE = "mq.route.xingxi.order.after.sale";
 
     /**
      * 退货完成路由KEY
      */
-    String EDIT_ROUTE_FOR_RETURNED = "mq.route.biandan.order.returned";
+    String EDIT_ROUTE_FOR_RETURNED = "mq.route.xingxi.order.returned";
 
     /**
      * 订单完成路由KEY
      */
-    String EDIT_ROUTE_FOR_FINISHED = "mq.route.biandan.order.finished";
+    String EDIT_ROUTE_FOR_FINISHED = "mq.route.xingxi.order.finished";
 
 
     //=====================================订单订阅队列===========================================================
     /**
      * 订单生成
      */
-    String EDIT_QUEUE_ORDER_FOR_CREATED = "mq.queue.biandan.order.created";
+    String EDIT_QUEUE_ORDER_FOR_CREATED = "mq.queue.xingxi.order.created";
 
     /**
      * 支付完成-订单订阅队列
      */
-    String EDIT_QUEUE_ORDER_FOR_PAYED = "mq.queue.biandan.order.payed";
+    String EDIT_QUEUE_ORDER_FOR_PAYED = "mq.queue.xingxi.order.payed";
 
     /**
      * 订单取消-清分订单订阅队列
      */
-    String EDIT_QUEUE_ORDER_FOR_CANCELED = "mq.queue.biandan.order.canceled";
+    String EDIT_QUEUE_ORDER_FOR_CANCELED = "mq.queue.xingxi.order.canceled";
 
     /**
      * 退货完成-订单成订阅队列
      */
-    String EDIT_QUEUE_ORDER_FOR_AFTER_SALE = "mq.queue.biandan.order.after.sale";
+    String EDIT_QUEUE_ORDER_FOR_AFTER_SALE = "mq.queue.xingxi.order.after.sale";
 
     /**
      * 退货完成-订单成订阅队列
      */
-    String EDIT_QUEUE_ORDER_FOR_RETURNED = "mq.queue.biandan.order.returned";
+    String EDIT_QUEUE_ORDER_FOR_RETURNED = "mq.queue.xingxi.order.returned";
 
     /**
      * 退货完成-订单成订阅队列
      */
-    String EDIT_QUEUE_ORDER_RETURNED_FOR_REFUND = "mq.queue.biandan.order.returned.refund";
+    String EDIT_QUEUE_ORDER_RETURNED_FOR_REFUND = "mq.queue.xingxi.order.returned.refund";
 
     /**
      * 订单完成-订单订阅队列
      */
-    String EDIT_QUEUE_ORDER_FOR_FINISHED = "mq.queue.biandan.order.finished";
+    String EDIT_QUEUE_ORDER_FOR_FINISHED = "mq.queue.xingxi.order.finished";
 
     /**
      * 订单取消-订单订阅队列
      */
-    String EDIT_QUEUE_ORDER_FOR_CANCELLED = "mq.queue.biandan.order.cancelled";
+    String EDIT_QUEUE_ORDER_FOR_CANCELLED = "mq.queue.xingxi.order.cancelled";
 
     //=====================================清分订单订阅队列===========================================================
     /**
      * 支付完成-清分订单订阅队列
      */
-    String EDIT_QUEUE_CLEAR_FOR_PAYED = "mq.queue.biandan.clear.order.payed";
+    String EDIT_QUEUE_CLEAR_FOR_PAYED = "mq.queue.xingxi.clear.order.payed";
 
     /**
      * 订单取消-清分订单订阅队列
      */
-    String EDIT_QUEUE_CLEAR_FOR_CANCELED = "mq.queue.biandan.clear.order.canceled";
+    String EDIT_QUEUE_CLEAR_FOR_CANCELED = "mq.queue.xingxi.clear.order.canceled";
 
     /**
      * 退货完成-清分订单成订阅队列
      */
-    String EDIT_QUEUE_CLEAR_FOR_RETURNED = "mq.queue.biandan.clear.order.returned";
+    String EDIT_QUEUE_CLEAR_FOR_RETURNED = "mq.queue.xingxi.clear.order.returned";
 
     /**
      * 订单完成-清分订单订阅队列
      */
-    String EDIT_QUEUE_CLEAR_FOR_FINISHED = "mq.queue.biandan.clear.order.finished";
+    String EDIT_QUEUE_CLEAR_FOR_FINISHED = "mq.queue.xingxi.clear.order.finished";
 
 
     //=====================================推广者佣金订阅队列===========================================================
     /**
      * 支付完成-推广者佣金订阅队列
      */
-    String EDIT_QUEUE_COMMISSION_FOR_PAYED = "mq.queue.biandan.commission.order.payed";
+    String EDIT_QUEUE_COMMISSION_FOR_PAYED = "mq.queue.xingxi.commission.order.payed";
 
     /**
      * 订单取消-推广者佣金订阅队列
      */
-    String EDIT_QUEUE_COMMISSION_FOR_CANCELED = "mq.queue.biandan.commission.order.canceled";
+    String EDIT_QUEUE_COMMISSION_FOR_CANCELED = "mq.queue.xingxi.commission.order.canceled";
 
     /**
      * 退货完成-推广者佣金订阅队列
      */
-    String EDIT_QUEUE_COMMISSION_FOR_RETURNED = "mq.queue.biandan.commission.order.returned";
+    String EDIT_QUEUE_COMMISSION_FOR_RETURNED = "mq.queue.xingxi.commission.order.returned";
 
     /**
      * 订单完成-推广者佣金订阅队列
      */
-    String EDIT_QUEUE_COMMISSION_FOR_FINISHED = "mq.queue.biandan.commission.order.finished";
+    String EDIT_QUEUE_COMMISSION_FOR_FINISHED = "mq.queue.xingxi.commission.order.finished";
 
 
     //=====================================发票订单订阅队列===========================================================
     /**
      * 支付完成-发票订单订阅队列
      */
-    String EDIT_QUEUE_INVOICE_FOR_PAYED = "mq.queue.biandan.invoice.order.payed";
+    String EDIT_QUEUE_INVOICE_FOR_PAYED = "mq.queue.xingxi.invoice.order.payed";
 
     /**
      * 订单取消-发票订单订阅队列
      */
-    String EDIT_QUEUE_INVOICE_FOR_CANCELED = "mq.queue.biandan.invoice.order.canceled";
+    String EDIT_QUEUE_INVOICE_FOR_CANCELED = "mq.queue.xingxi.invoice.order.canceled";
 
     /**
      * 退货完成-发票订单订阅队列
      */
-    String EDIT_QUEUE_INVOICE_FOR_RETURNED = "mq.queue.biandan.invoice.order.returned";
+    String EDIT_QUEUE_INVOICE_FOR_RETURNED = "mq.queue.xingxi.invoice.order.returned";
 
     /**
      * 订单完成-发票订单订阅队列
      */
-    String EDIT_QUEUE_INVOICE_FOR_FINISHED = "mq.queue.biandan.invoice.order.finished";
+    String EDIT_QUEUE_INVOICE_FOR_FINISHED = "mq.queue.xingxi.invoice.order.finished";
 
 
     //===========================================延迟============================================================
     /**
      * 订单消息交换机(延迟)
      */
-    String EDIT_EXCHANGE_DELAY = "mq.exchange.topic.biandan.delay.order";
+    String EDIT_EXCHANGE_DELAY = "mq.exchange.topic.xingxi.delay.order";
 
     /**
      *  订单生成路由KEY
      */
-    String EDIT_ROUTE_DELAY_FOR_CREATED = "mq.route.biandan.delay.order.created";
+    String EDIT_ROUTE_DELAY_FOR_CREATED = "mq.route.xingxi.delay.order.created";
 
     /**
      * 超时未支付订阅队列
      */
-    String EDIT_QUEUE_DELAY_FOR_UNPAID = "mq.queue.biandan.delay.order.unpaid";
+    String EDIT_QUEUE_DELAY_FOR_UNPAID = "mq.queue.xingxi.delay.order.unpaid";
 }

08.src/Xingxi/xingxi-framework/src/main/java/com/xingxi/framework/config/ApplicationConfig.java

@@ -7,14 +7,13 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 /**
  * 程序注解配置
  *
- * @author ruoyi
+ * @author xingxi
  */
 @Configuration
 // 表示通过aop框架暴露该代理对象,AopContext能够访问
 @EnableAspectJAutoProxy(exposeProxy = true)
 // 指定要扫描的Mapper类的包的路径
 @MapperScan("com.xingxi.**.mapper")
-public class ApplicationConfig
-{
+public class ApplicationConfig {
 
 }

08.src/Xingxi/xingxi-generator/src/main/java/com/xingxi/generator/domain/GenTableColumn.java

@@ -332,7 +332,7 @@ public class GenTableColumn extends BaseEntity
     {
         return StringUtils.equalsAnyIgnoreCase(javaField,
                 // BaseEntity
-                "createBy", "createTime", "updateBy", "updateTime", "remark",
+                "createUser", "createTime", "updateUser", "updateTime", "remark",
                 // TreeEntity
                 "parentName", "parentId", "orderNum", "ancestors");
     }

08.src/Xingxi/xingxi-generator/src/main/java/com/xingxi/generator/util/GenUtils.java

@@ -1,6 +1,7 @@
 package com.xingxi.generator.util;
 
 import java.util.Arrays;
+
 import org.apache.commons.lang3.RegExUtils;
 import com.xingxi.common.constant.GenConstants;
 import com.xingxi.common.utils.StringUtils;
@@ -10,70 +11,59 @@ import com.xingxi.generator.domain.GenTableColumn;
 
 /**
  * 代码生成器 工具类
- * 
+ *
  * @author ruoyi
  */
-public class GenUtils
-{
+public class GenUtils {
     /**
      * 初始化表信息
      */
-    public static void initTable(GenTable genTable, String operName)
-    {
+    public static void initTable(GenTable genTable, String operName) {
         genTable.setClassName(convertClassName(genTable.getTableName()));
         genTable.setPackageName(GenConfig.getPackageName());
         genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
         genTable.setBusinessName(getBusinessName(genTable.getTableName()));
         genTable.setFunctionName(replaceText(genTable.getTableComment()));
         genTable.setFunctionAuthor(GenConfig.getAuthor());
-        genTable.setCreateBy(operName);
+        genTable.setCreateUser(operName);
     }
 
     /**
      * 初始化列属性字段
      */
-    public static void initColumnField(GenTableColumn column, GenTable table)
-    {
+    public static void initColumnField(GenTableColumn column, GenTable table) {
         String dataType = getDbType(column.getColumnType());
         String columnName = column.getColumnName();
         column.setTableId(table.getTableId());
-        column.setCreateBy(table.getCreateBy());
+        column.setCreateUser(table.getCreateUser());
         // 设置java字段名
         column.setJavaField(StringUtils.toCamelCase(columnName));
         // 设置默认类型
         column.setJavaType(GenConstants.TYPE_STRING);
         column.setQueryType(GenConstants.QUERY_EQ);
 
-        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType))
-        {
+        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) {
             // 字符串长度超过500设置为文本域
             Integer columnLength = getColumnLength(column.getColumnType());
             String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
             column.setHtmlType(htmlType);
-        }
-        else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType))
-        {
+        } else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) {
             column.setJavaType(GenConstants.TYPE_DATE);
             column.setHtmlType(GenConstants.HTML_DATETIME);
-        }
-        else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType))
-        {
+        } else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) {
             column.setHtmlType(GenConstants.HTML_INPUT);
 
             // 如果是浮点型 统一用BigDecimal
             String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ",");
-            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0)
-            {
+            if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) {
                 column.setJavaType(GenConstants.TYPE_BIGDECIMAL);
             }
             // 如果是整形
-            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10)
-            {
+            else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) {
                 column.setJavaType(GenConstants.TYPE_INTEGER);
             }
             // 长整形
-            else
-            {
+            else {
                 column.setJavaType(GenConstants.TYPE_LONG);
             }
         }
@@ -82,69 +72,59 @@ public class GenUtils
         column.setIsInsert(GenConstants.REQUIRE);
 
         // 编辑字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk())
-        {
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk()) {
             column.setIsEdit(GenConstants.REQUIRE);
         }
         // 列表字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk())
-        {
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk()) {
             column.setIsList(GenConstants.REQUIRE);
         }
         // 查询字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk())
-        {
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) {
             column.setIsQuery(GenConstants.REQUIRE);
         }
 
         // 查询字段类型
-        if (StringUtils.endsWithIgnoreCase(columnName, "name"))
-        {
+        if (StringUtils.endsWithIgnoreCase(columnName, "name")) {
             column.setQueryType(GenConstants.QUERY_LIKE);
         }
         // 状态字段设置单选框
-        if (StringUtils.endsWithIgnoreCase(columnName, "status"))
-        {
+        if (StringUtils.endsWithIgnoreCase(columnName, "status")) {
             column.setHtmlType(GenConstants.HTML_RADIO);
         }
         // 类型&性别字段设置下拉框
         else if (StringUtils.endsWithIgnoreCase(columnName, "type")
-                || StringUtils.endsWithIgnoreCase(columnName, "sex"))
-        {
+                || StringUtils.endsWithIgnoreCase(columnName, "sex")) {
             column.setHtmlType(GenConstants.HTML_SELECT);
         }
         // 文件字段设置上传控件
-        else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
-        {
+        else if (StringUtils.endsWithIgnoreCase(columnName, "file")) {
             column.setHtmlType(GenConstants.HTML_UPLOAD);
         }
         // 内容字段设置富文本控件
-        else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
-        {
+        else if (StringUtils.endsWithIgnoreCase(columnName, "content")) {
             column.setHtmlType(GenConstants.HTML_SUMMERNOTE);
         }
     }
 
     /**
      * 校验数组是否包含指定值
-     * 
-     * @param arr 数组
+     *
+     * @param arr         数组
      * @param targetValue 值
      * @return 是否包含
      */
-    public static boolean arraysContains(String[] arr, String targetValue)
-    {
+    public static boolean arraysContains(String[] arr, String targetValue) {
         return Arrays.asList(arr).contains(targetValue);
     }
 
     /**
      * 获取模块名
-     * 
+     *
      * @param packageName 包名
      * @return 模块名
      */
-    public static String getModuleName(String packageName)
-    {
+    public static String getModuleName(String packageName) {
         int lastIndex = packageName.lastIndexOf(".");
         int nameLength = packageName.length();
         return StringUtils.substring(packageName, lastIndex + 1, nameLength);
@@ -152,12 +132,11 @@ public class GenUtils
 
     /**
      * 获取业务名
-     * 
+     *
      * @param tableName 表名
      * @return 业务名
      */
-    public static String getBusinessName(String tableName)
-    {
+    public static String getBusinessName(String tableName) {
         int lastIndex = tableName.lastIndexOf("_");
         int nameLength = tableName.length();
         return StringUtils.substring(tableName, lastIndex + 1, nameLength);
@@ -165,16 +144,14 @@ public class GenUtils
 
     /**
      * 表名转换成Java类名
-     * 
+     *
      * @param tableName 表名称
      * @return 类名
      */
-    public static String convertClassName(String tableName)
-    {
+    public static String convertClassName(String tableName) {
         boolean autoRemovePre = GenConfig.getAutoRemovePre();
         String tablePrefix = GenConfig.getTablePrefix();
-        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix))
-        {
+        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) {
             String[] searchList = StringUtils.split(tablePrefix, ",");
             tableName = replaceFirst(tableName, searchList);
         }
@@ -183,18 +160,15 @@ public class GenUtils
 
     /**
      * 批量替换前缀
-     * 
+     *
      * @param replacementm 替换值
-     * @param searchList 替换列表
+     * @param searchList   替换列表
      * @return
      */
-    public static String replaceFirst(String replacementm, String[] searchList)
-    {
+    public static String replaceFirst(String replacementm, String[] searchList) {
         String text = replacementm;
-        for (String searchString : searchList)
-        {
-            if (replacementm.startsWith(searchString))
-            {
+        for (String searchString : searchList) {
+            if (replacementm.startsWith(searchString)) {
                 text = replacementm.replaceFirst(searchString, "");
                 break;
             }
@@ -204,48 +178,39 @@ public class GenUtils
 
     /**
      * 关键字替换
-     * 
+     *
      * @param text 需要被替换的名字
      * @return 替换后的名字
      */
-    public static String replaceText(String text)
-    {
+    public static String replaceText(String text) {
         return RegExUtils.replaceAll(text, "(?:表|若依)", "");
     }
 
     /**
      * 获取数据库类型字段
-     * 
+     *
      * @param columnType 列类型
      * @return 截取后的列类型
      */
-    public static String getDbType(String columnType)
-    {
-        if (StringUtils.indexOf(columnType, "(") > 0)
-        {
+    public static String getDbType(String columnType) {
+        if (StringUtils.indexOf(columnType, "(") > 0) {
             return StringUtils.substringBefore(columnType, "(");
-        }
-        else
-        {
+        } else {
             return columnType;
         }
     }
 
     /**
      * 获取字段长度
-     * 
+     *
      * @param columnType 列类型
      * @return 截取后的列类型
      */
-    public static Integer getColumnLength(String columnType)
-    {
-        if (StringUtils.indexOf(columnType, "(") > 0)
-        {
+    public static Integer getColumnLength(String columnType) {
+        if (StringUtils.indexOf(columnType, "(") > 0) {
             String length = StringUtils.substringBetween(columnType, "(", ")");
             return Integer.valueOf(length);
-        }
-        else
-        {
+        } else {
             return 0;
         }
     }

08.src/Xingxi/xingxi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -23,9 +23,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="htmlType"       column="html_type"      />
         <result property="dictType"       column="dict_type"      />
         <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
+        <result property="createUser"       column="create_by"      />
         <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
+        <result property="updateUser"       column="update_by"      />
         <result property="updateTime"     column="update_time"    />
     </resultMap>
 	
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="htmlType != null and htmlType != ''">html_type,</if>
 			<if test="dictType != null and dictType != ''">dict_type,</if>
 			<if test="sort != null">sort,</if>
-			<if test="createBy != null and createBy != ''">create_by,</if>
+			<if test="createUser != null and createUser != ''">create_by,</if>
 			create_time
          )values(
 			<if test="tableId != null and tableId != ''">#{tableId},</if>
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="htmlType != null and htmlType != ''">#{htmlType},</if>
 			<if test="dictType != null and dictType != ''">#{dictType},</if>
 			<if test="sort != null">#{sort},</if>
-			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			<if test="createUser != null and createUser != ''">#{createUser},</if>
 			sysdate()
          )
     </insert>
@@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             html_type = #{htmlType},
             dict_type = #{dictType},
             sort = #{sort},
-            update_by = #{updateBy},
+            update_by = #{updateUser},
             update_time = sysdate()
         </set>
         where column_id = #{columnId}

08.src/Xingxi/xingxi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -21,9 +21,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="genType"        column="gen_type"          />
 		<result property="genPath"        column="gen_path"          />
 		<result property="options"        column="options"           />
-		<result property="createBy"       column="create_by"         />
+		<result property="createUser"       column="create_by"         />
 		<result property="createTime"     column="create_time"       />
-		<result property="updateBy"       column="update_by"         />
+		<result property="updateUser"       column="update_by"         />
 		<result property="updateTime"     column="update_time"       />
 		<result property="remark"         column="remark"            />
 		<collection  property="columns"   javaType="java.util.List"  resultMap="GenTableColumnResult" />
@@ -48,9 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="htmlType"       column="html_type"      />
         <result property="dictType"       column="dict_type"      />
         <result property="sort"           column="sort"           />
-        <result property="createBy"       column="create_by"      />
+        <result property="createUser"       column="create_by"      />
         <result property="createTime"     column="create_time"    />
-        <result property="updateBy"       column="update_by"      />
+        <result property="updateUser"       column="update_by"      />
         <result property="updateTime"     column="update_time"    />
     </resultMap>
 	
@@ -144,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="genType != null and genType != ''">gen_type,</if>
 			<if test="genPath != null and genPath != ''">gen_path,</if>
 			<if test="remark != null and remark != ''">remark,</if>
- 			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="createUser != null and createUser != ''">create_by,</if>
 			create_time
          )values(
 			<if test="tableName != null">#{tableName},</if>
@@ -160,7 +160,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="genType != null and genType != ''">#{genType},</if>
 			<if test="genPath != null and genPath != ''">#{genPath},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
- 			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 			<if test="createUser != null and createUser != ''">#{createUser},</if>
 			sysdate()
          )
     </insert>
@@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="businessName != null and businessName != ''">business_name = #{businessName},</if>
             <if test="functionName != null and functionName != ''">function_name = #{functionName},</if>
             <if test="options != null and options != ''">options = #{options},</if>
-            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateUser != null and updateUser != ''">update_by = #{updateUser},</if>
             <if test="remark != null">remark = #{remark},</if>
             update_time = sysdate()
         </set>

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

@@ -1,6 +1,5 @@
 package com.xingxi.store.configuration;
 
-
 import lombok.RequiredArgsConstructor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.MessageSource;
@@ -21,21 +20,15 @@ import java.util.Locale;
 
 import static com.google.common.collect.ImmutableMap.of;
 
-
-
-
-
-
 @EnableAsync
 @RequiredArgsConstructor
 @Configuration
-@MapperScan({"cn.com.wingxi.biandan.**.mapper"})
+@MapperScan({"com.xingxi.**.mapper"})
 @ComponentScan(basePackages = {
-        "cn.com.wingxi.biandan.system.common.service",
-        "cn.com.wingxi.biandan.common.config",
-        "cn.com.wingxi.biandan.common.aliyun.oss",
-        "cn.com.wingxi.biandan.common.utils.uuid",
-        "cn.com.wingxi.biandan.common.mq"
+        "com.xingxi.common.config",
+        "com.xingxi.common.aliyun.oss",
+        "com.xingxi.common.utils.uuid",
+        "com.xingxi.common.mq"
 })
 class AppConfiguration implements MessageSourceAware {
 
@@ -46,7 +39,6 @@ class AppConfiguration implements MessageSourceAware {
         this.messageSource = messageSource;
     }
 
-
     @Bean
     public LocalValidatorFactoryBean getValidator() {
         LocalValidatorFactoryBean bean = new LocalValidatorFactoryBean();
@@ -88,6 +80,4 @@ class AppConfiguration implements MessageSourceAware {
 
         };
     }
-
-
 }

08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/application.yml

@@ -17,7 +17,7 @@ spring:
       max-request-size: 20MB
 
 mybatis:
-  typeAliasesPackage: cn.com.wingxi.biandan.**.domain
+  typeAliasesPackage: com.wingxi.**.domain
   mapperLocations: classpath*:META-INF/sqlmap/**.xml,classpath*:mapper/**/**.xml
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

08.src/Xingxi/xingxi-miniprogram-api/src/test/java/cn/com/wingxi/biandan/store/BiandanMiniprogramStoreApiApplicationTests.java

@@ -1,50 +0,0 @@
-package cn.com.wingxi.biandan.store;
-
-import com.xingxi.store.data.domain.ProductAttrDTO;
-import com.xingxi.store.data.mapper.WxaStoreProductMapper;
-import cn.com.wingxi.biandan.system.product.mapper.ProdPropMapper;
-import cn.com.wingxi.biandan.system.product.mapper.ProdPropRelationMapper;
-import cn.com.wingxi.biandan.system.product.mapper.ProdPropValueMapper;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-
-@SpringBootTest
-class BiandanMiniprogramStoreApiApplicationTests {
-
-    @Resource
-    private ProdPropRelationMapper prodPropRelationMapper;
-    @Resource
-    private ProdPropValueMapper prodPropValueMapper;
-    @Resource
-    private ProdPropMapper prodPropMapper;
-
-
-    @Resource
-    private WxaStoreProductMapper productRepository;
-
-
-    @Test
-    void contextLoads() {
-
-        StringBuilder test = new StringBuilder();
-        List<ProductAttrDTO> productAttrDTOS = productRepository.selectAttrByProductId(1L, 1L);
-
-        for (ProductAttrDTO productAttrDTO : productAttrDTOS) {
-            List<ProductAttrDTO> values = productAttrDTO.getValues();
-            for (ProductAttrDTO value : values) {
-                test.append(value.getLabel());
-                break;
-            }
-
-        }
-
-
-
-        System.out.println(test);
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/test/java/cn/com/wingxi/biandan/store/biandanunifiedpaytest/BiandanUnifiedpayTest.java

@@ -1,181 +0,0 @@
-package cn.com.wingxi.biandan.store.biandanunifiedpaytest;
-
-
-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.mapper.PaymentInfoMapper;
-import cn.com.wingxi.biandan.unifiedpay.bean.*;
-import cn.com.wingxi.biandan.unifiedpay.domain.MercUnifiedpayConfigDTO;
-import cn.com.wingxi.biandan.unifiedpay.open.BiandanUnifiedpayServiceI;
-import cn.com.wingxi.biandan.unifiedpay.repository.BiandanUnifiedpayRepository;
-import com.github.binarywang.wxpay.bean.request.WxPaySendMiniProgramRedpackRequest;
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import com.github.binarywang.wxpay.v3.util.PemUtils;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import java.io.ByteArrayInputStream;
-import java.math.BigDecimal;
-import java.util.List;
-
-@SpringBootTest
-public class BiandanUnifiedpayTest {
-
-    @Autowired
-    private BiandanUnifiedpayServiceI biandanUnifiedpayServiceI;
-    @Autowired
-    private PaymentInfoMapper paymentInfoMapper;
-
-
-    @Autowired
-    private BiandanUnifiedpayRepository biandanUnifiedpayRepository;
-
-
-    @Test
-    public void testWxRedPack(){
-
-        MercUnifiedpayConfigDTO mercUnifiedpayConfigDTO = biandanUnifiedpayRepository.selectMercUnifiedpayConfigDTOByCallUnifiedpayMercId(100L);
-        String mchId = mercUnifiedpayConfigDTO.getMchId();
-        String appId = mercUnifiedpayConfigDTO.getAppId();
-        String wxApiV3key = mercUnifiedpayConfigDTO.getApiV3Key();
-        byte[] privateKeyContent = mercUnifiedpayConfigDTO.getPrivateKeyContent();
-        byte[] privateCertContent = mercUnifiedpayConfigDTO.getPrivateCertContent();
-
-
-        WxPaySendMiniProgramRedpackRequest request = new WxPaySendMiniProgramRedpackRequest();
-        request.setMchBillNo(IdUtils.snowFlake());
-        request.setMchId(mchId);
-        request.setWxAppid(appId);
-        request.setSendName("扁担");
-        request.setReOpenid("o9GqB5GOppphYceQ3cGYEDRswRAA");
-        request.setTotalAmount(1);
-        request.setTotalNum(1);
-        request.setWishing("感谢您参加猜灯谜活动，祝您元宵节快乐！");
-        request.setActName("猜灯谜抢红包活动");
-        request.setRemark("猜越多得越多，快来抢！");
-
-        WxPayConfig wxPayConfig = new WxPayConfig();
-        wxPayConfig.setKeyPath("classpath:apiclient_cert.p12");
-        wxPayConfig.setMchKey("shanghairongxikejiyouxiangongsi8");
-
-        wxPayConfig.setMchId(mchId);
-        wxPayConfig.setAppId(appId);
-        wxPayConfig.setApiV3Key(wxApiV3key);
-        wxPayConfig.setPrivateKeyContent(privateKeyContent);
-        wxPayConfig.setPrivateCertContent(privateCertContent);
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(wxPayConfig.getPrivateKeyContent());
-        wxPayConfig.setPrivateKey(PemUtils.loadPrivateKey(inputStream));
-
-//        String wxMchId = wxPayConfig.getMchId();
-//        if (!wxPayService.switchover(wxMchId)) {
-//            wxPayService.addConfig(wxMchId, wxPayConfig);
-//        }
-//
-//        try {
-//            WxPayService wxPayService =  this.wxPayService.switchoverTo(wxMchId);
-//            RedpackService redpackService = wxPayService.getRedpackService();
-//            WxPaySendMiniProgramRedpackResult wxPaySendMiniProgramRedpackResult = redpackService.sendMiniProgramRedpack(request);
-//            System.out.println(wxPaySendMiniProgramRedpackResult);
-//        } catch (WxPayException e) {
-//            e.printStackTrace();
-//        }
-    }
-
-
-    @Test
-    public void testQueryOrder(){
-        BiandanUnifiedpayQueryOrderRequest request = new BiandanUnifiedpayQueryOrderRequest();
-        request.setSellerId(100000000001L);
-        request.setTransactionId("4200001387202204184520924428");
-        try {
-            BiandanUnifiedpayQueryOrderResponse response = biandanUnifiedpayServiceI.getResponse(request);
-            System.out.println(response);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Test
-    public void testRefund(){
-
-        BiandanUnifiedpayRefundRequest request = new BiandanUnifiedpayRefundRequest();
-        request.setSellerId(100000000001L);
-        request.setTransactionId("4200001387202204184520924428");
-        request.setOutRefundNo(IdUtils.snowFlake());
-        request.setRefundAmt(12);
-        request.setOrderOriginalTotalAmt(12);
-        request.setCurrency("CNY");
-
-        System.out.println(request.getOutRefundNo());
-
-        // 202205241528958959888764928
-
-        try {
-            BiandanUnifiedpayRefundResponse response = biandanUnifiedpayServiceI.getResponse(request);
-            System.out.println(response);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-
-
-    @Test
-    public void testQueryRefund(){
-
-        BiandanUnifiedpayQueryRefundRequest request = new BiandanUnifiedpayQueryRefundRequest();
-        request.setSellerId(100000000001L);
-        request.setOutRefundNo("202205241528958959888764928");
-        // 202205241528958959888764928
-        try {
-            BiandanUnifiedpayQueryRefundResponse response = biandanUnifiedpayServiceI.getResponse(request);
-            System.out.println(response);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-
-
-
-    @Test
-    public void testRefundList(){
-
-
-        List<PaymentInfo> paymentInfos = paymentInfoMapper.selectPaymentInfoList(null);
-        for (PaymentInfo paymentInfo : paymentInfos) {
-
-            BigDecimal payAmount = paymentInfo.getPayAmount();
-            String transactionId = paymentInfo.getTransactionId();
-            Long sellerId = paymentInfo.getSellerId();
-
-            if (payAmount != null && payAmount.intValue() > 0 && transactionId != null) {
-
-                BiandanUnifiedpayRefundRequest request = new BiandanUnifiedpayRefundRequest();
-                request.setSellerId(100000000001L);
-                request.setTransactionId(transactionId);
-                request.setOutRefundNo(IdUtils.snowFlake());
-                request.setRefundAmt(payAmount.intValue());
-                request.setOrderOriginalTotalAmt(payAmount.intValue());
-                request.setCurrency("CNY");
-
-                System.out.println(request.getOutRefundNo());
-
-                // 202205241528958959888764928
-
-                try {
-                    BiandanUnifiedpayRefundResponse response = biandanUnifiedpayServiceI.getResponse(request);
-                    System.out.println(response);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-
-
-        }
-
-    }
-
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/test/java/cn/com/wingxi/biandan/store/data/repository/OrderRepositoryTest.java

@@ -1,96 +0,0 @@
-package cn.com.wingxi.biandan.store.data.repository;
-
-import cn.com.wingxi.biandan.common.aliyun.oss.AliyunOSSClient;
-import cn.com.wingxi.biandan.common.utils.uuid.IdUtils;
-import com.xingxi.store.data.mapper.WxaStoreOrderMapper;
-import cn.com.wingxi.biandan.system.order.domain.Order;
-import com.aliyun.oss.model.CannedAccessControlList;
-import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
-import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderV3Result;
-import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import com.github.binarywang.wxpay.exception.WxPayException;
-import com.github.binarywang.wxpay.service.WxPayService;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.util.ResourceUtils;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-
-
-@SpringBootTest
-class OrderRepositoryTest {
-    DateTimeFormatter DTF = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss+08:00");
-    @Autowired
-    private WxaStoreOrderMapper orderRepository;
-
-    @Autowired
-    private AliyunOSSClient client;
-
-    @Autowired
-    private WxPayService wxPayService;
-
-
-    @Test
-    public void insertOrder(){
-        Order insertOrder  = new Order();
-        insertOrder.setUpdateTime(new Date());
-        orderRepository.insertOrder(insertOrder);
-        System.out.println(insertOrder.getUpdateTime());
-    }
-
-
-    @Test
-    public void testPrivateUpload() throws Exception{
-//        InputStream inputStream = new FileInputStream("C:\\Users\\fuzhou.dong\\Desktop\\微信图片_20220403154312.jpg");
-
-        File file = ResourceUtils.getFile("classpath:META-INF/apiclient_key.pem");
-        InputStream inputStream2 = new FileInputStream(file);
-        String s = client.putObject("OSS/private/wxpay/100/apiclient_key.pem", inputStream2, CannedAccessControlList.Private);
-        System.out.println(s);
-    }
-
-
-
-    @Test
-    public void testWXPAY(){
-        WxPayConfig wxPayConfig = new WxPayConfig();
-//        wxPayConfig.setAppId("wxa48e27134927a8cf");
-        wxPayConfig.setAppId("wxfa0929d642df6f7c");
-        wxPayConfig.setMchId("1514166051");
-        wxPayConfig.setApiV3Key("Rongxi88888888888888888888888888");
-        wxPayConfig.setPrivateKeyPath("classpath:META-INF/apiclient_key.pem");
-        wxPayConfig.setPrivateCertPath("classpath:META-INF/apiclient_cert.pem");
-        wxPayService.addConfig("1514166051", wxPayConfig);
-
-        WxPayService wxPayService = this.wxPayService.switchoverTo("1514166051");
-
-        WxPayUnifiedOrderV3Request wxPayUnifiedOrderV3Request = new WxPayUnifiedOrderV3Request();
-        WxPayUnifiedOrderV3Request.Payer payer = new WxPayUnifiedOrderV3Request.Payer();
-        payer.setOpenid("o9GqB5GOppphYceQ3cGYEDRswRAA");
-        wxPayUnifiedOrderV3Request.setPayer(payer);
-        wxPayUnifiedOrderV3Request.setDescription("扁担定制购物测试");
-        WxPayUnifiedOrderV3Request.Amount amount = new WxPayUnifiedOrderV3Request.Amount();
-        amount.setCurrency("CNY");
-        amount.setTotal(100);
-        wxPayUnifiedOrderV3Request.setAmount(amount);
-        wxPayUnifiedOrderV3Request.setOutTradeNo(IdUtils.snowFlake());
-        wxPayUnifiedOrderV3Request.setNotifyUrl("https://ministore.njnet.vip/wxpay/100/callback");
-        wxPayUnifiedOrderV3Request.setTimeExpire(DTF.format(LocalDateTime.now().plusMinutes(15)));
-
-        try {
-            WxPayUnifiedOrderV3Result wxPayUnifiedOrderV3Result = wxPayService.unifiedOrderV3(TradeTypeEnum.JSAPI, wxPayUnifiedOrderV3Request);
-            System.out.println(wxPayUnifiedOrderV3Result);
-        } catch (WxPayException e) {
-            e.printStackTrace();
-        }
-
-
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/test/java/cn/com/wingxi/biandan/store/data/repository/ProductRepositoryTest.java

@@ -1,27 +0,0 @@
-package cn.com.wingxi.biandan.store.data.repository;
-
-import com.xingxi.store.data.domain.ProductDTO;
-import com.xingxi.store.data.mapper.WxaStoreProductMapper;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import java.util.List;
-
-
-@SpringBootTest
-class ProductRepositoryTest {
-
-    @Autowired
-    private WxaStoreProductMapper productRepository;
-
-    @Test
-    void selectProductList() {
-
-        ProductDTO productDTO = new ProductDTO();
-        productDTO.setMercId("100000000001");
-        List<ProductDTO> productDTOS = productRepository.selectProductList(productDTO);
-
-        System.out.println(productDTOS);
-    }
-}

08.src/Xingxi/xingxi-miniprogram-api/src/test/java/cn/com/wingxi/biandan/store/data/repository/QrcodeTest.java

@@ -1,64 +0,0 @@
-package cn.com.wingxi.biandan.store.data.repository;
-
-
-import cn.binarywang.wx.miniapp.api.WxMaQrcodeService;
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import me.chanjar.weixin.common.error.WxErrorException;
-import org.checkerframework.dataflow.qual.TerminatesExecution;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.util.StreamUtils;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.nio.file.Files;
-
-@SpringBootTest
-public class QrcodeTest {
-
-
-    @Value("${aliyun.oss.customDomain}")
-    private String customDomain;
-    @Value("${wx.qrCode.scene}")
-    private String scene;
-    @Value("${wx.qrCode.page}")
-    private String page;
-    @Value("${wx.qrCode.width}")
-    private Integer width;
-    @Value("${wx.qrCode.checkPath}")
-    private Boolean checkPath;
-    @Value("${wx.qrCode.envVersion}")
-    private String envVersion;
-
-
-    @Autowired
-    private  WxMaService wxMaService;
-
-
-    @Test
-    public void testQrcode(){
-        // mercId,popuId
-        String sceneStr = String.format("%s,%s", "100000000051", "");
-        WxMaQrcodeService qrcodeService = wxMaService.getQrcodeService();
-        File qrCodeFile = null;
-        try {
-            qrCodeFile = qrcodeService.createWxaCodeUnlimit(
-                    sceneStr, page, checkPath, "trial", 500, true, null, false);
-
-            FileOutputStream fileOutputStream = new FileOutputStream("c:/home/test.png");
-            StreamUtils.copy(Files.newInputStream(qrCodeFile.toPath()), fileOutputStream);
-
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-    }
-
-}
-
-

08.src/Xingxi/xingxi-miniprogram-api/src/test/java/cn/com/wingxi/biandan/store/data/repository/RecommendProductRepositoryTest.java

@@ -1,25 +0,0 @@
-package cn.com.wingxi.biandan.store.data.repository;
-
-import com.xingxi.store.data.domain.ShopRecommendDTO;
-import com.xingxi.store.data.mapper.WxaStoreRecommendProductMapper;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-
-@SpringBootTest
-class RecommendProductRepositoryTest {
-
-    @Autowired
-    private WxaStoreRecommendProductMapper recommendProductRepository;
-
-
-    @Test
-    void selectShopRecommendByMercId(){
-        ShopRecommendDTO shopRecommendDTO =
-                recommendProductRepository.selectShopRecommendByMercId("100000000001");
-
-        System.out.println(shopRecommendDTO);
-    }
-
-}

08.src/Xingxi/xingxi-miniprogram-api/src/test/java/cn/com/wingxi/biandan/store/data/repository/UserProdRepositoryTest.java

@@ -1,36 +0,0 @@
-package cn.com.wingxi.biandan.store.data.repository;
-
-import com.xingxi.store.data.domain.UserProdDTO;
-import com.xingxi.store.data.mapper.WxaStoreUserProdMapper;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import java.util.List;
-
-
-@SpringBootTest
-class UserProdRepositoryTest {
-
-    private final ObjectMapper objectMapper = new ObjectMapper();
-
-    @Autowired
-    private WxaStoreUserProdMapper userProdRepository;
-
-    @Test
-    void selectUserProdListByUpId() {
-        List<UserProdDTO> userProdDTOS = userProdRepository.selectUserProdListByUpId("2b3b77dc146a44d181768f8f8a76b7ac");
-        System.out.println(userProdDTOS);
-    }
-
-    @Test
-    void selectUserProdDetailListByUserId() throws Exception{
-
-        List<UserProdDTO> userProdDTOS = userProdRepository.selectUserProdDetailListByUserId(100000000001L, 100000000001L);
-
-        System.out.println(objectMapper.writeValueAsString(userProdDTOS));
-    }
-
-
-}

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

@@ -1,11 +1,5 @@
 package com.xingxi.mq.consumer.clear;
 
-//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 com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.rabbitmq.client.Channel;
@@ -42,9 +36,6 @@ public class ClearOrderCanceledMqConsumer extends AbstractRabbitConsumer {
     @Resource
     private IClearOrderVoService iClearOrderVoService;
 
-    @Resource
-//    private IClearOrderDetailService iClearOrderDetailService;
-
     @Bean(OrderMqKey.EDIT_QUEUE_CLEAR_FOR_CANCELED)
     @Override
     protected List<Binding> getBindingList() {

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/BiandanMqServerApplication.java

@@ -1,17 +0,0 @@
-package cn.com.wingxi.biandan;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-
-/**
- * 启动程序
- *
- * @author hocy
- */
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-public class BiandanMqServerApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(BiandanMqServerApplication.class, args);
-    }
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/common/aspectj/DataSourceAspect.java

@@ -1,52 +0,0 @@
-package cn.com.wingxi.biandan.mq.common.aspectj;
-
-import cn.com.wingxi.biandan.common.annotation.DataSource;
-import cn.com.wingxi.biandan.mq.common.datasource.DynamicDataSourceContextHolder;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.core.annotation.Order;
-import org.springframework.stereotype.Component;
-
-import java.lang.reflect.Method;
-
-/**
- * 多数据源处理
- *
- * @author hocy
- */
-@Aspect
-@Order(1)
-@Component
-public class DataSourceAspect {
-    protected Logger logger = LoggerFactory.getLogger(getClass());
-
-    @Pointcut("@annotation(cn.com.wingxi.biandan.mq.common.aspectj.lang.annotation.DataSource)")
-    public void dsPointCut() {
-
-    }
-
-    @Around("dsPointCut()")
-    public Object around(ProceedingJoinPoint point) throws Throwable {
-        MethodSignature signature = (MethodSignature) point.getSignature();
-
-        Method method = signature.getMethod();
-
-        DataSource dataSource = method.getAnnotation(DataSource.class);
-
-        if (dataSource != null) {
-            DynamicDataSourceContextHolder.setDataSourceType(dataSource.value().name());
-        }
-
-        try {
-            return point.proceed();
-        } finally {
-            // 销毁数据源 在执行方法之后
-            DynamicDataSourceContextHolder.clearDataSourceType();
-        }
-    }
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/common/aspectj/lang/annotation/DataSource.java

@@ -1,22 +0,0 @@
-package cn.com.wingxi.biandan.mq.common.aspectj.lang.annotation;
-
-import cn.com.wingxi.biandan.common.enums.DataSourceType;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * 自定义多数据源切换注解
- *
- * @author hocy
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface DataSource {
-    /**
-     * 切换数据源名称
-     */
-    DataSourceType value() default DataSourceType.MASTER;
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/common/aspectj/lang/enums/DataSourceType.java

@@ -1,18 +0,0 @@
-package cn.com.wingxi.biandan.mq.common.aspectj.lang.enums;
-
-/**
- * 数据源
- *
- * @author hocy
- */
-public enum DataSourceType {
-    /**
-     * 主库
-     */
-    MASTER,
-
-    /**
-     * 从库
-     */
-    SLAVE
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/common/datasource/DynamicDataSource.java

@@ -1,24 +0,0 @@
-package cn.com.wingxi.biandan.mq.common.datasource;
-
-import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
-
-import javax.sql.DataSource;
-import java.util.Map;
-
-/**
- * 动态数据源
- *
- * @author hocy
- */
-public class DynamicDataSource extends AbstractRoutingDataSource {
-    public DynamicDataSource(DataSource defaultTargetDataSource, Map<Object, Object> targetDataSources) {
-        super.setDefaultTargetDataSource(defaultTargetDataSource);
-        super.setTargetDataSources(targetDataSources);
-        super.afterPropertiesSet();
-    }
-
-    @Override
-    protected Object determineCurrentLookupKey() {
-        return DynamicDataSourceContextHolder.getDataSourceType();
-    }
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/common/datasource/DynamicDataSourceContextHolder.java

@@ -1,41 +0,0 @@
-package cn.com.wingxi.biandan.mq.common.datasource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 数据源切换处理
- *
- * @author hocy
- */
-public class DynamicDataSourceContextHolder {
-    public static final Logger log = LoggerFactory.getLogger(DynamicDataSourceContextHolder.class);
-
-    /**
-     * 使用ThreadLocal维护变量，ThreadLocal为每个使用该变量的线程提供独立的变量副本，
-     * 所以每一个线程都可以独立地改变自己的副本，而不会影响其它线程所对应的副本。
-     */
-    private static final ThreadLocal<String> CONTEXT_HOLDER = new ThreadLocal<>();
-
-    /**
-     * 设置数据源的变量
-     */
-    public static void setDataSourceType(String dsType) {
-        log.info("切换到{}数据源", dsType);
-        CONTEXT_HOLDER.set(dsType);
-    }
-
-    /**
-     * 获得数据源的变量
-     */
-    public static String getDataSourceType() {
-        return CONTEXT_HOLDER.get();
-    }
-
-    /**
-     * 清空数据源变量
-     */
-    public static void clearDataSourceType() {
-        CONTEXT_HOLDER.remove();
-    }
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/config/ApplicationConfig.java

@@ -1,37 +0,0 @@
-package cn.com.wingxi.biandan.mq.config;
-
-import cn.com.wingxi.biandan.common.config.IdWorkCfg;
-import cn.com.wingxi.biandan.common.utils.uuid.IdUtils;
-import cn.com.wingxi.biandan.system.system.service.ISysConfigService;
-import cn.com.wingxi.biandan.system.system.service.ISysDictTypeService;
-import cn.com.wingxi.biandan.system.system.service.ISysUserOnlineService;
-import cn.com.wingxi.biandan.system.system.service.ISysUserService;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.context.annotation.*;
-
-/**
- * 程序注解配置
- *
- * @author biandan
- */
-
-@Configuration
-// 表示通过aop框架暴露该代理对象,AopContext能够访问
-@EnableAspectJAutoProxy(exposeProxy = true)
-// 指定要扫描的Mapper类的包的路径
-@MapperScan("cn.com.wingxi.biandan.**.mapper")
-@ComponentScan(value = {
-        "cn.com.wingxi.biandan.system",
-        "cn.com.wingxi.biandan.common.mq.publisher"
-}, excludeFilters = {
-        @ComponentScan.Filter(
-                type = FilterType.ASSIGNABLE_TYPE,
-                classes = {ISysUserService.class,
-                        ISysDictTypeService.class,
-                        ISysUserOnlineService.class}
-        )
-})
-@Import({IdWorkCfg.class, IdUtils.class})
-public class ApplicationConfig {
-
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/config/DruidConfig.java

@@ -1,97 +0,0 @@
-package cn.com.wingxi.biandan.mq.config;
-
-import cn.com.wingxi.biandan.common.enums.DataSourceType;
-import cn.com.wingxi.biandan.mq.common.datasource.DynamicDataSource;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
-import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
-import com.alibaba.druid.util.Utils;
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Primary;
-
-import javax.servlet.*;
-import javax.sql.DataSource;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * druid 配置多数据源
- *
- * @author hocy
- */
-@Configuration
-public class DruidConfig {
-    @Bean
-    @ConfigurationProperties("spring.datasource.druid.master")
-    public DataSource masterDataSource(DruidProperties druidProperties) {
-        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
-        return druidProperties.dataSource(dataSource);
-    }
-
-    @Bean
-    @ConfigurationProperties("spring.datasource.druid.slave")
-    @ConditionalOnProperty(prefix = "spring.datasource.druid.slave", name = "enabled", havingValue = "true")
-    public DataSource slaveDataSource(DruidProperties druidProperties) {
-        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
-        return druidProperties.dataSource(dataSource);
-    }
-
-    @Bean(name = "dynamicDataSource")
-    @Primary
-    public DynamicDataSource dataSource(DataSource masterDataSource, DataSource slaveDataSource) {
-        Map<Object, Object> targetDataSources = new HashMap<>();
-        targetDataSources.put(DataSourceType.MASTER.name(), masterDataSource);
-        targetDataSources.put(DataSourceType.SLAVE.name(), slaveDataSource);
-        return new DynamicDataSource(masterDataSource, targetDataSources);
-    }
-
-    /**
-     * 去除监控页面底部的广告
-     */
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    @Bean
-    @ConditionalOnProperty(name = "spring.datasource.druid.statViewServlet.enabled", havingValue = "true")
-    public FilterRegistrationBean removeDruidFilterRegistrationBean(DruidStatProperties properties) {
-        // 获取web监控页面的参数
-        DruidStatProperties.StatViewServlet config = properties.getStatViewServlet();
-        // 提取common.js的配置路径
-        String pattern = config.getUrlPattern() != null ? config.getUrlPattern() : "/druid/*";
-        String commonJsPattern = pattern.replaceAll("\\*", "js/common.js");
-        final String filePath = "support/http/resources/js/common.js";
-        // 创建filter进行过滤
-        Filter filter = new Filter() {
-            @Override
-            public void init(FilterConfig filterConfig) throws ServletException {
-            }
-
-            @Override
-            public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-                    throws IOException, ServletException {
-                chain.doFilter(request, response);
-                // 重置缓冲区，响应头不会被重置
-                response.resetBuffer();
-                // 获取common.js
-                String text = Utils.readFromResource(filePath);
-                // 正则替换banner, 除去底部的广告信息
-                text = text.replaceAll("<a.*?banner\"></a><br/>", "");
-                text = text.replaceAll("powered.*?shrek.wang</a>", "");
-                response.getWriter().write(text);
-            }
-
-            @Override
-            public void destroy() {
-            }
-        };
-        FilterRegistrationBean registrationBean = new FilterRegistrationBean();
-        registrationBean.setFilter(filter);
-        registrationBean.addUrlPatterns(commonJsPattern);
-        return registrationBean;
-    }
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/config/DruidProperties.java

@@ -1,75 +0,0 @@
-package cn.com.wingxi.biandan.mq.config;
-
-import com.alibaba.druid.pool.DruidDataSource;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * druid 配置属性
- *
- * @author hocy
- */
-@Configuration
-public class DruidProperties {
-    @Value("${spring.datasource.druid.initialSize}")
-    private int initialSize;
-
-    @Value("${spring.datasource.druid.minIdle}")
-    private int minIdle;
-
-    @Value("${spring.datasource.druid.maxActive}")
-    private int maxActive;
-
-    @Value("${spring.datasource.druid.maxWait}")
-    private int maxWait;
-
-    @Value("${spring.datasource.druid.timeBetweenEvictionRunsMillis}")
-    private int timeBetweenEvictionRunsMillis;
-
-    @Value("${spring.datasource.druid.minEvictableIdleTimeMillis}")
-    private int minEvictableIdleTimeMillis;
-
-    @Value("${spring.datasource.druid.maxEvictableIdleTimeMillis}")
-    private int maxEvictableIdleTimeMillis;
-
-    @Value("${spring.datasource.druid.validationQuery}")
-    private String validationQuery;
-
-    @Value("${spring.datasource.druid.testWhileIdle}")
-    private boolean testWhileIdle;
-
-    @Value("${spring.datasource.druid.testOnBorrow}")
-    private boolean testOnBorrow;
-
-    @Value("${spring.datasource.druid.testOnReturn}")
-    private boolean testOnReturn;
-
-    public DruidDataSource dataSource(DruidDataSource datasource) {
-        /** 配置初始化大小、最小、最大 */
-        datasource.setInitialSize(initialSize);
-        datasource.setMaxActive(maxActive);
-        datasource.setMinIdle(minIdle);
-
-        /** 配置获取连接等待超时的时间 */
-        datasource.setMaxWait(maxWait);
-
-        /** 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 */
-        datasource.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
-
-        /** 配置一个连接在池中最小、最大生存的时间，单位是毫秒 */
-        datasource.setMinEvictableIdleTimeMillis(minEvictableIdleTimeMillis);
-        datasource.setMaxEvictableIdleTimeMillis(maxEvictableIdleTimeMillis);
-
-        /**
-         * 用来检测连接是否有效的sql，要求是一个查询语句，常用select 'x'。如果validationQuery为null，testOnBorrow、testOnReturn、testWhileIdle都不会起作用。
-         */
-        datasource.setValidationQuery(validationQuery);
-        /** 建议配置为true，不影响性能，并且保证安全性。申请连接的时候检测，如果空闲时间大于timeBetweenEvictionRunsMillis，执行validationQuery检测连接是否有效。 */
-        datasource.setTestWhileIdle(testWhileIdle);
-        /** 申请连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 */
-        datasource.setTestOnBorrow(testOnBorrow);
-        /** 归还连接时执行validationQuery检测连接是否有效，做了这个配置会降低性能。 */
-        datasource.setTestOnReturn(testOnReturn);
-        return datasource;
-    }
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/config/RabbitMqConfig.java

@@ -1,31 +0,0 @@
-package cn.com.wingxi.biandan.mq.config;
-
-import org.springframework.amqp.core.AcknowledgeMode;
-import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
-import org.springframework.amqp.rabbit.connection.ConnectionFactory;
-import org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @ClassName RabbitMqConfig
- * @projectName biandan
- * @Deacription // TODO
- * @Author FZ.Dong
- * @Date 2020/9/16 13:48
- * @Version 1.0
- **/
-
-
-@Configuration
-public class RabbitMqConfig {
-
-    @Bean
-    public RabbitListenerContainerFactory<?> rabbitListenerContainerFactory(ConnectionFactory connectionFactory) {
-        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
-        factory.setConnectionFactory(connectionFactory);
-//        factory.setMessageConverter(new Jackson2JsonMessageConverter());
-        factory.setAcknowledgeMode(AcknowledgeMode.MANUAL);
-        return factory;
-    }
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/consumer/clear/ClearOrderCanceledMqConsumer.java

@@ -1,113 +0,0 @@
-package cn.com.wingxi.biandan.mq.consumer.clear;
-
-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.mq.server.order.service.IClearOrderVoService;
-import cn.com.wingxi.biandan.system.order.domain.ClearOrder;
-import cn.com.wingxi.biandan.system.order.domain.ClearOrderDetail;
-import cn.com.wingxi.biandan.system.order.service.IClearOrderDetailService;
-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;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @ClassName ClearOrderCanceledMqConsumer
- * @projectName hocy
- * @Deacription 订单取消消息接受处理
- * @Author FZ.Dong
- * @Date 2020/9/15 16:56
- * @Version 1.0
- **/
-@Slf4j
-@Component
-public class ClearOrderCanceledMqConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private IClearOrderVoService iClearOrderVoService;
-
-    @Resource
-    private IClearOrderDetailService iClearOrderDetailService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_CLEAR_FOR_CANCELED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_CLEAR_FOR_CANCELED,
-                OrderMqKey.EDIT_ROUTE_FOR_CANCELED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_CLEAR_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);
-
-        // 按照订单分组
-        Map<Long, List<OrderCanceledBO>> orderMap = canceledBos.stream().collect(Collectors.groupingBy(item -> item.getOrderId()));
-        // 按照订单分组
-        for (Map.Entry<Long, List<OrderCanceledBO>> orderEntry : orderMap.entrySet()) {
-
-            // 订单ID
-            Long orderId = orderEntry.getKey();
-
-            // 退款明细
-            List<OrderCanceledBO> cancels = orderEntry.getValue();
-            for (OrderCanceledBO ocbo : cancels) {
-                ClearOrderDetail scod = new ClearOrderDetail();
-                // 设置订单编号
-                scod.setOrderId(ocbo.getOrderId());
-                scod.setSuiteId(ocbo.getSuiteId());
-                scod.setOrderDetailId(ocbo.getOrderDetailId());
-                // 订单明细数据取得
-                List<ClearOrderDetail> detailList = iClearOrderDetailService.selectClearOrderDetailList(scod);
-                for(ClearOrderDetail cod : detailList) {
-                    ClearOrderDetail ucod = new ClearOrderDetail();
-                    ucod.setId(cod.getId());
-                    // 设置退货数量等于订单数量
-                    ucod.setReturnQty(cod.getOrderQty());
-                    // 取消状态
-                    ucod.setOrderStatus(EOrderStatus.CANCELLED.getVal());
-                    // 设置更新用户
-                    ucod.setUpdateUser("清分订单取消MQ");
-                    // 设置更新时间
-                    ucod.setUpdateTime(nowDate);
-                    iClearOrderDetailService.updateClearOrderDetail(ucod);
-                }
-            }
-
-            // 明细全取消的情况，主订单也更新取消状态
-            ClearOrder uco = new ClearOrder();
-            uco.setOrderId(orderId);
-            uco.setOrderStatus(EOrderStatus.CANCELLED.getVal());
-            uco.setUpdateTime(nowDate);
-            uco.setUpdateUser("清分订单取消MQ");
-            iClearOrderVoService.syncOrderStatusByOrderId(uco);
-        }
-        log.info("清分订单取消MQ： 推送的订单数据处理完成.");
-        return true;
-    }
-    
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/consumer/clear/ClearOrderFinishedMqConsumer.java

@@ -1,111 +0,0 @@
-package cn.com.wingxi.biandan.mq.consumer.clear;
-
-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.mq.server.order.service.IOrderDetailVoService;
-import cn.com.wingxi.biandan.system.order.domain.ClearOrder;
-import cn.com.wingxi.biandan.system.order.domain.ClearOrderDetail;
-import cn.com.wingxi.biandan.system.order.service.IClearOrderDetailService;
-import cn.com.wingxi.biandan.system.order.service.IClearOrderService;
-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 ClearOrderReturnedMqConsumer
- * @projectName hocy
- * @Deacription 订单完成消息接受处理
- * @Author FZ.Dong
- * @Date 2020/9/15 16:56
- * @Version 1.0
- **/
-@Slf4j
-@Component
-public class ClearOrderFinishedMqConsumer extends AbstractRabbitConsumer
-{
-    @Resource
-    private IOrderDetailVoService orderDetailVoService;
-
-    @Resource
-    private IClearOrderService iClearOrderService;
-
-    @Resource
-    private IClearOrderDetailService iClearOrderDetailService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_CLEAR_FOR_FINISHED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_CLEAR_FOR_FINISHED,
-                OrderMqKey.EDIT_ROUTE_FOR_FINISHED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_CLEAR_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);
-
-        // 订单明细
-        ClearOrderDetail scod = new ClearOrderDetail();
-        // 设置订单编号
-        scod.setOrderId(orderFinishedBO.getOrderId());
-        scod.setOrderDetailId(orderFinishedBO.getOrderDetailId());
-        scod.setSuiteId(orderFinishedBO.getSuiteId());
-        // 订单明细数据取得
-        List<ClearOrderDetail> detailList = iClearOrderDetailService.selectClearOrderDetailList(scod);
-
-        if(CollectionUtils.isEmpty(detailList)){
-            log.info("清分订单完成MQ： 订单【{}】明细表不存在，不做处理.", orderFinishedBO.getOrderId());
-            return true;
-        }
-        for(ClearOrderDetail cod : detailList) {
-            ClearOrderDetail ucod = new ClearOrderDetail();
-            ucod.setId(cod.getId());
-            // 完成状态
-            ucod.setOrderStatus(EOrderStatus.FINISHED.getVal());
-            // 完成时间
-            ucod.setFinishTime(nowDate);
-            // 设置更新用户
-            ucod.setUpdateUser("清分订单完成MQ");
-            // 设置更新时间
-            ucod.setUpdateTime(nowDate);
-            iClearOrderDetailService.updateClearOrderDetail(ucod);
-        }
-
-        // 明细全完成的情况，主订单也更新完成状态
-        if(orderDetailVoService.checkOrderFinished(orderFinishedBO.getOrderId()) <= 0) {
-            ClearOrder uco = new ClearOrder();
-            uco.setOrderId(orderFinishedBO.getOrderId());
-            uco.setOrderStatus(EOrderStatus.FINISHED.getVal());
-            uco.setUpdateTime(nowDate);
-            uco.setUpdateUser("清分订单完成MQ");
-            iClearOrderService.updateClearOrder(uco);
-        }
-        log.info("清分订单完成MQ： 推送的订单数据处理完成.");
-        return true;
-    }
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/consumer/clear/ClearOrderPayedMqConsumer.java

@@ -1,596 +0,0 @@
-package cn.com.wingxi.biandan.mq.consumer.clear;
-
-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 cn.com.wingxi.biandan.mq.server.material.domain.MaterialKindMq;
-import cn.com.wingxi.biandan.mq.server.material.service.IMatePriceMqService;
-import cn.com.wingxi.biandan.mq.server.material.service.IMaterialKindMqService;
-import cn.com.wingxi.biandan.mq.server.product.domain.ProdMateMq;
-import cn.com.wingxi.biandan.mq.server.product.service.IProdMateMqService;
-import cn.com.wingxi.biandan.mq.server.product.service.IProdPriceMqService;
-import cn.com.wingxi.biandan.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.merchant.domain.Merchant;
-import cn.com.wingxi.biandan.system.merchant.service.IMerchantService;
-import cn.com.wingxi.biandan.system.order.domain.ClearOrder;
-import cn.com.wingxi.biandan.system.order.domain.ClearOrderDetail;
-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.IClearOrderDetailService;
-import cn.com.wingxi.biandan.system.order.service.IClearOrderService;
-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.vendor.domain.Vendor;
-import cn.com.wingxi.biandan.system.vendor.service.IVendorService;
-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 订单清分
- * @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;
-        }
-    }
-
-    /**
-     * 构建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/target/classes/cn/com/wingxi/biandan/mq/consumer/clear/ClearOrderReturnedMqConsumer.java

@@ -1,88 +0,0 @@
-package cn.com.wingxi.biandan.mq.consumer.clear;
-
-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.mq.server.order.service.IClearOrderDetailVoService;
-import cn.com.wingxi.biandan.system.order.domain.ClearOrderDetail;
-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 ClearOrderReturnedMqConsumer
- * @projectName hocy
- * @Deacription 订单退货消息接受处理
- *              更新退货数量
- * @Author FZ.Dong
- * @Date 2020/9/15 16:56
- * @Version 1.0
- **/
-@Slf4j
-@Component
-public class ClearOrderReturnedMqConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private IClearOrderDetailVoService iClearOrderDetailVoService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_CLEAR_FOR_RETURNED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_CLEAR_FOR_RETURNED,
-                OrderMqKey.EDIT_ROUTE_FOR_CANCELED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_CLEAR_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;
-            }
-            ClearOrderDetail ucod = new ClearOrderDetail();
-            // 设置订单编号
-            ucod.setOrderId(orbo.getOrderId());
-            ucod.setOrderDetailId(orbo.getOrderDetailId());
-            ucod.setSuiteId(orbo.getSuiteId());
-            ucod.setReturnQty(returnQty);
-            ucod.setUpdateTime(nowDate);
-            ucod.setUpdateUser("清分订单退货完成MQ");
-            iClearOrderDetailVoService.updateReturnQty(ucod);
-        }
-
-        log.info("清分订单退货完成MQ： 推送的订单数据处理完成.");
-        return true;
-    }
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/consumer/commission/CommissionOrderCanceledConsumer.java

@@ -1,131 +0,0 @@
-package cn.com.wingxi.biandan.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 cn.com.wingxi.biandan.mq.server.order.service.ICommissionOrderDetailVoService;
-import cn.com.wingxi.biandan.mq.server.order.service.ICommissionOrderVoService;
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/consumer/commission/CommissionOrderFinishedConsumer.java

@@ -1,102 +0,0 @@
-package cn.com.wingxi.biandan.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 cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/consumer/commission/CommissionOrderPayedConsumer.java

@@ -1,227 +0,0 @@
-package cn.com.wingxi.biandan.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 cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/consumer/commission/CommissionOrderReturnedConsumer.java

@@ -1,157 +0,0 @@
-package cn.com.wingxi.biandan.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 cn.com.wingxi.biandan.mq.server.order.service.ICommissionOrderDetailVoService;
-import cn.com.wingxi.biandan.mq.server.order.service.ICommissionOrderVoService;
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/consumer/commission/CommissionUtils.java

@@ -1,53 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/consumer/invoice/InvoiceApplyShdzfpConsumer.java

@@ -1,268 +0,0 @@
-package cn.com.wingxi.biandan.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 cn.com.wingxi.biandan.mq.server.master.service.ICompanyMqService;
-import cn.com.wingxi.biandan.mq.server.shdzfp.InvoiceField;
-import cn.com.wingxi.biandan.mq.server.shdzfp.client.InvoiceClient;
-import cn.com.wingxi.biandan.mq.server.shdzfp.payload.FpKjXxRequest;
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/consumer/invoice/InvoiceOrderCanceledConsumer.java

@@ -1,87 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/consumer/invoice/InvoiceOrderFinishedConsumer.java

@@ -1,92 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/consumer/invoice/InvoiceOrderPayedConsumer.java

@@ -1,549 +0,0 @@
-package cn.com.wingxi.biandan.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 cn.com.wingxi.biandan.mq.server.material.domain.MaterialKindMq;
-import cn.com.wingxi.biandan.mq.server.material.service.IMatePriceMqService;
-import cn.com.wingxi.biandan.mq.server.material.service.IMaterialKindMqService;
-import cn.com.wingxi.biandan.mq.server.product.domain.ProdMateMq;
-import cn.com.wingxi.biandan.mq.server.product.service.IProdMateMqService;
-import cn.com.wingxi.biandan.mq.server.product.service.IProdPriceMqService;
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/consumer/invoice/InvoiceOrderReturnedConsumer.java

@@ -1,87 +0,0 @@
-package cn.com.wingxi.biandan.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 cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/consumer/order/OrderCloseConsumer.java

@@ -1,165 +0,0 @@
-package cn.com.wingxi.biandan.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 cn.com.wingxi.biandan.mq.server.order.service.IPaymentInfoMqService;
-import cn.com.wingxi.biandan.mq.server.product.domain.ProdStockVo;
-import cn.com.wingxi.biandan.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.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;
-
-@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() {
-        long xmTtl = 10 * 60 * 1000;
-        return Lists.newArrayList(
-                this.bindDelay(OrderMqKey.EDIT_EXCHANGE_DELAY,
-                        OrderMqKey.EDIT_QUEUE_DELAY_FOR_UNPAID,
-                        OrderMqKey.EDIT_ROUTE_DELAY_FOR_CREATED,
-                        xmTtl));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_DELAY_FOR_UNPAID)
-    @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);
-
-        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/target/classes/cn/com/wingxi/biandan/mq/consumer/order/OrderCreatedConsumer.java

@@ -1,58 +0,0 @@
-package cn.com.wingxi.biandan.mq.consumer.order;
-
-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.mq.publisher.order.OrderUnPaidMqPublisher;
-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.List;
-
-@Slf4j
-@Component
-public class OrderCreatedConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private OrderUnPaidMqPublisher orderUnPaidMqPublisher;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_ORDER_FOR_CREATED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(
-                this.bind(OrderMqKey.EDIT_EXCHANGE,
-                        OrderMqKey.EDIT_QUEUE_ORDER_FOR_CREATED,
-                        OrderMqKey.EDIT_ROUTE_FOR_CREATED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_ORDER_FOR_CREATED)
-    @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);
-
-        // 消息转发至延迟队列
-        OrderBO orderBO = JSON.parseObject(body, OrderBO.class);
-        if(orderBO == null) {
-            return true;
-        }
-        orderUnPaidMqPublisher.sendMessage(orderBO);
-
-        log.info("订单生成后推送至延迟队列MQ,订单【{}】数据处理完成.", orderBO.getOrderNo());
-        return true;
-    }
-
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/consumer/order/OrderReturnedConsumer.java

@@ -1,85 +0,0 @@
-package cn.com.wingxi.biandan.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 cn.com.wingxi.biandan.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 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;
-
-/**
- * 退货确认消息
- * 将退货数量从订单信息的售后中数量减少，增加只已退货数量中
- */
-
-@Slf4j
-@Component
-public class OrderReturnedConsumer extends AbstractRabbitConsumer {
-
-    @Resource
-    private IOrderDetailVoService orderDetailVoService;
-
-    @Bean(OrderMqKey.EDIT_QUEUE_ORDER_FOR_RETURNED)
-    @Override
-    protected List<Binding> getBindingList() {
-        return Lists.newArrayList(this.bind(OrderMqKey.EDIT_EXCHANGE,
-                OrderMqKey.EDIT_QUEUE_ORDER_FOR_RETURNED,
-                OrderMqKey.EDIT_ROUTE_FOR_RETURNED));
-    }
-
-    @RabbitListener(queues = OrderMqKey.EDIT_QUEUE_ORDER_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 = returnQty + orbo.getStockQty();
-            }
-            if(orbo.getScrapQty() != null) {
-                returnQty = returnQty + orbo.getScrapQty();
-            }
-            int afterQty = returnQty;
-            if(orbo.getRejectQty() != null) {
-                afterQty = afterQty + orbo.getRejectQty();
-            }
-            OrderDetail uod = new OrderDetail();
-            uod.setOrderId(orbo.getOrderId());
-            uod.setOrderDetailId(orbo.getOrderDetailId());
-            uod.setSuiteId(orbo.getSuiteId());
-            uod.setAfterQty(afterQty);
-            uod.setReturnQty(returnQty);
-            uod.setUpdateUser("订单退货完成MQ");
-            uod.setUpdateTime(nowDate);
-
-            orderDetailVoService.updateReturnQty(uod);
-        }
-
-        log.info("订单退货完成MQ,推送的订单数据处理完成.");
-        return true;
-    }
-
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/consumer/refund/OrderCancelledConsumer.java

@@ -1,178 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/consumer/refund/OrderRefundConsumer.java

@@ -1,145 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/master/mapper/CompanyMqMapper.java

@@ -1,24 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/master/service/ICompanyMqService.java

@@ -1,22 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/master/service/impl/CompanyMqServiceImpl.java

@@ -1,33 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.master.service.impl;
-
-import cn.com.wingxi.biandan.mq.server.master.mapper.CompanyMqMapper;
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/material/domain/MaterialKindMq.java

@@ -1,23 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/material/mapper/MatePriceMqMapper.java

@@ -1,24 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/material/mapper/MaterialKindMqMapper.java

@@ -1,23 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.material.mapper;
-
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/material/service/IMatePriceMqService.java

@@ -1,22 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/material/service/IMaterialKindMqService.java

@@ -1,21 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.material.service;
-
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/material/service/impl/MatePriceMqServiceImpl.java

@@ -1,35 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.material.service.impl;
-
-import cn.com.wingxi.biandan.mq.server.material.mapper.MatePriceMqMapper;
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/material/service/impl/MaterialKindMqServiceImpl.java

@@ -1,32 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.material.service.impl;
-
-import cn.com.wingxi.biandan.mq.server.material.domain.MaterialKindMq;
-import cn.com.wingxi.biandan.mq.server.material.mapper.MaterialKindMqMapper;
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/order/mapper/ClearOrderDetailVoMapper.java

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

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/server/order/mapper/ClearOrderVoMapper.java

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

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/server/order/mapper/CommissionOrderDetailVoMapper.java

@@ -1,23 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/order/mapper/CommissionOrderVoMapper.java

@@ -1,31 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/order/mapper/InvoiceOrderMqMapper.java

@@ -1,23 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/order/mapper/OrderDetailMqMapper.java

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

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/server/order/mapper/PaymentInfoMqMapper.java

@@ -1,22 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/order/service/IClearOrderDetailVoService.java

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

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/server/order/service/IClearOrderVoService.java

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

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/server/order/service/ICommissionOrderDetailVoService.java

@@ -1,21 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/order/service/ICommissionOrderVoService.java

@@ -1,29 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/order/service/IInvoiceOrderMqService.java

@@ -1,20 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/order/service/IOrderDetailVoService.java

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

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/server/order/service/IPaymentInfoMqService.java

@@ -1,20 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/order/service/impl/ClearOrderDetailVoServiceImpl.java

@@ -1,31 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.order.service.impl;
-
-import cn.com.wingxi.biandan.mq.server.order.mapper.ClearOrderDetailVoMapper;
-import cn.com.wingxi.biandan.mq.server.order.service.IClearOrderDetailVoService;
-import cn.com.wingxi.biandan.system.order.domain.ClearOrderDetail;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 清算订单详细信息Service业务层处理
- * 
- * @author biandan
- * @date 2022-02-23
- */
-@Service
-public class ClearOrderDetailVoServiceImpl implements IClearOrderDetailVoService
-{
-    @Autowired
-    private ClearOrderDetailVoMapper clearOrderDetailVoMapper;
-
-    /**
-     * 更新退货数量
-     *
-     * @param clearOrderDetail 清算订单详细信息
-     * @return 清算订单详细信息Vo集合
-     */
-    public int updateReturnQty(ClearOrderDetail clearOrderDetail)
-    {
-        return clearOrderDetailVoMapper.updateReturnQty(clearOrderDetail);
-    }
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/server/order/service/impl/ClearOrderVoServiceImpl.java

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

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/server/order/service/impl/CommissionOrderDetailVoServiceImpl.java

@@ -1,33 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.order.service.impl;
-
-import cn.com.wingxi.biandan.mq.server.order.mapper.CommissionOrderDetailVoMapper;
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/order/service/impl/CommissionOrderVoServiceImpl.java

@@ -1,44 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.order.service.impl;
-
-import cn.com.wingxi.biandan.mq.server.order.mapper.CommissionOrderVoMapper;
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/order/service/impl/InvoiceOrderMqServiceImpl.java

@@ -1,32 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.order.service.impl;
-
-import cn.com.wingxi.biandan.mq.server.order.mapper.InvoiceOrderMqMapper;
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/order/service/impl/OrderDetailVoServiceImpl.java

@@ -1,43 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.order.service.impl;
-
-import cn.com.wingxi.biandan.mq.server.order.mapper.OrderDetailMqMapper;
-import cn.com.wingxi.biandan.mq.server.order.service.IOrderDetailVoService;
-import cn.com.wingxi.biandan.system.order.domain.OrderDetail;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * 订单明细Service业务层处理
- * 
- * @author biandan
- * @date 2022-02-23
- */
-@Service
-public class OrderDetailVoServiceImpl implements IOrderDetailVoService
-{
-    @Autowired
-    private OrderDetailMqMapper orderDetailVoMapper;
-
-    /**
-     * 校验订单是否完成
-     *
-     * @param orderId
-     * @return
-     */
-    public int checkOrderFinished(Long orderId){
-        return orderDetailVoMapper.checkOrderFinished(orderId);
-    }
-
-    /**
-     * 更新退货数量
-     *
-     * @param orderDetail 订单详细信息
-     * @return 订单详细信息Vo集合
-     */
-    @Override
-    public int updateReturnQty(OrderDetail orderDetail)
-    {
-        return orderDetailVoMapper.updateReturnQty(orderDetail);
-    }
-
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/server/order/service/impl/PaymentInfoMqServiceImpl.java

@@ -1,32 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.order.service.impl;
-
-import cn.com.wingxi.biandan.mq.server.order.mapper.PaymentInfoMqMapper;
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/product/domain/ProdMateMq.java

@@ -1,22 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/product/domain/ProdStockVo.java

@@ -1,41 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/product/mapper/ProdMateMqMapper.java

@@ -1,33 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.product.mapper;
-
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/product/mapper/ProdPriceMqMapper.java

@@ -1,26 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/product/mapper/ProdStockVoMapper.java

@@ -1,57 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.product.mapper;
-
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/product/service/IProdMateMqService.java

@@ -1,35 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.product.service;
-
-import cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/product/service/IProdPriceMqService.java

@@ -1,22 +0,0 @@
-package cn.com.wingxi.biandan.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/target/classes/cn/com/wingxi/biandan/mq/server/product/service/IProdStockVoService.java

@@ -1,56 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.product.service;
-
-import cn.com.wingxi.biandan.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);
-
-}

08.src/Xingxi/xingxi-mq-server/target/classes/cn/com/wingxi/biandan/mq/server/product/service/impl/ProdMateMqServiceImpl.java

@@ -1,51 +0,0 @@
-package cn.com.wingxi.biandan.mq.server.product.service.impl;
-
-import cn.com.wingxi.biandan.mq.server.product.domain.ProdMateMq;
-import cn.com.wingxi.biandan.mq.server.product.mapper.ProdMateMqMapper;
-import cn.com.wingxi.biandan.mq.server.product.service.IProdMateMqService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 商品素材Service业务层处理
- * 
- * @author biandan
- * @date 2022-04-01
- */
-@Service
-public class ProdMateMqServiceImpl implements IProdMateMqService
-{
-    @Autowired
-    private ProdMateMqMapper prodMateMqMapper;
-
-    /**
-     * 查询商品素材列表
-     *
-     * @param prodId 商品Id
-     * @param pprId 商品属性Id
-     * @return 商品素材
-     */
-    @Override
-    public List<ProdMateMq> selectProdMateUnitQty(Long prodId, Long pprId)
-    {
-        ProdMateMq spm = new ProdMateMq();
-        spm.setProdId(prodId);
-        spm.setPprId(pprId);
-        return prodMateMqMapper.selectProdMateUnitQty(spm);
-    }
-
-    /**
-     * 查询商品固化时设计面数量
-     *
-     * @param prodId 商品Id
-     * @param pprId 商品属性Id
-     *
-     * @return 商品素材集合
-     */
-    @Override
-    public int selectProdMateSurfaceQty(Long prodId, Long pprId){
-        return prodMateMqMapper.selectProdMateSurfaceQty(prodId, pprId);
-    }
-}