Merge branch '0930' of kjds/maopengtech into master

build-api.sh

@@ -1,41 +0,0 @@
-#版本 注意，需要跟随版本号进行调整
-version=4.2.4
-#代码目录
-code_path=/home/source/maopengtech
-#运行目录
-run_path=/home/source/api/
-#代码分支
-branch=enversion
-
-mkdir -p ${code_path}
-mkdir -p ${run_path}
-cd ${code_path}
-git fetch origin 
-git checkout ${branch}
-git pull origin ${branch}
-git reset origin/${branch} --hard
-mvn clean install -DskipTests
-
-ps -ef |grep java |grep buyer  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
-ps -ef |grep java |grep seller  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
-ps -ef |grep java |grep manager  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
-ps -ef |grep java |grep common  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
-ps -ef |grep java |grep consumer  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
-
-rm -rf ${run_path}*.jar
-mv ${code_path}/common-api/target/common-api-$version.jar ${run_path}
-mv ${code_path}/buyer-api/target/buyer-api-$version.jar ${run_path}
-mv ${code_path}/consumer/target/consumer-$version.jar ${run_path}
-mv ${code_path}/manager-api/target/manager-api-$version.jar ${run_path}
-mv ${code_path}/seller-api/target/seller-api-$version.jar ${run_path}
-
-cd ${run_path}
-
-mkdir logs
-
-nohup java -Xmx256m -Xms128m -Xss256k  -jar manager-api-$version.jar> logs/manager.out  &
-nohup java -Xmx256m -Xms128m -Xss256k  -jar common-api-$version.jar> logs/common.out  &
-nohup java -Xmx256m -Xms128m -Xss256k  -jar buyer-api-$version.jar> logs/buyer.out  &
-nohup java -Xmx256m -Xms128m -Xss256k  -jar consumer-$version.jar> logs/consumer.out  &
-nohup java -Xmx256m -Xms128m -Xss256k  -jar seller-api-$version.jar> logs/seller.out  &
-

buyer-api/src/main/java/cn/lili/controller/order/CartController.java

@@ -9,7 +9,10 @@ import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.cart.entity.enums.CartTypeEnum;
 import cn.lili.modules.order.cart.entity.vo.TradeParams;
 import cn.lili.modules.order.cart.service.CartService;
+import cn.lili.modules.order.order.entity.dos.Trade;
 import cn.lili.modules.order.order.entity.vo.ReceiptVO;
+import cn.lili.modules.order.order.service.OrderService;
+import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -40,6 +43,12 @@ public class CartController {
     @Autowired
     private CartService cartService;
 
+    /**
+     * 订单
+     */
+    @Autowired
+    private OrderService orderService;
+
 
     @ApiOperation(value = "向购物车中添加一个产品")
     @PostMapping
@@ -242,7 +251,8 @@ public class CartController {
     public ResultMessage<Object> crateTrade(@RequestBody TradeParams tradeParams) {
         try {
             //读取选中的列表
-            return ResultUtil.data(this.cartService.createTrade(tradeParams));
+            Trade trade = this.cartService.createTrade(tradeParams);
+            return ResultUtil.data(trade);
         } catch (ServiceException se) {
             log.info(se.getMsg(), se);
             throw se;

buyer-api/src/test/java/cn/lili/buyer/test/customs/CustomsTest.java

@@ -0,0 +1,171 @@
+package cn.lili.buyer.test.customs;
+
+import cn.hutool.core.util.XmlUtil;
+import cn.hutool.json.JSONUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.util.Map;
+
+//@ExtendWith(SpringExtension.class)
+//@SpringBootTest
+public class CustomsTest {
+
+
+    public static void main(String[] args){
+        String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                "<ceb:CEB303Message guid=\"311af125-6fed-4603-8c5d-49b1fa4b4b9b\" version=\"1.0\"  xmlns:ceb=\"http://www.chinaport.gov.cn/ceb\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n" +
+                "\t<ceb:Order>\n" +
+                "\t\t<ceb:OrderHead>\n" +
+                "\t\t\t<ceb:guid>704ea0f1-b229-4e89-9f2f-c2e550e95c86</ceb:guid>\n" +
+                "\t\t\t<ceb:appType>1</ceb:appType>\n" +
+                "\t\t\t<ceb:appTime>20180507153001</ceb:appTime>\n" +
+                "\t\t\t<ceb:appStatus>2</ceb:appStatus>\n" +
+                "\t\t\t<ceb:orderType>E</ceb:orderType>\n" +
+                "\t\t\t<ceb:orderNo>order2018050711340001</ceb:orderNo>\n" +
+                "\t\t\t<ceb:ebpCode>1105910159</ceb:ebpCode>\n" +
+                "\t\t\t<ceb:ebpName>东方物通科技(北京)有限公司</ceb:ebpName>\n" +
+                "\t\t\t<ceb:ebcCode>1105910159</ceb:ebcCode>\n" +
+                "\t\t\t<ceb:ebcName>东方物通科技(北京)有限公司</ceb:ebcName>\n" +
+                "\t\t\t<ceb:goodsValue>12345678912345.12345</ceb:goodsValue>\n" +
+                "\t\t\t<ceb:freight>0</ceb:freight>\n" +
+                "\t\t\t<ceb:currency>142</ceb:currency>\n" +
+                "\t\t\t<ceb:note>test</ceb:note>\n" +
+                "\t\t</ceb:OrderHead>\n" +
+                "\t\t<ceb:OrderList>\n" +
+                "\t\t\t<ceb:gnum>1</ceb:gnum>\n" +
+                "\t\t\t<ceb:itemNo>AF001-001</ceb:itemNo>\n" +
+                "\t\t\t<ceb:itemName>小米盒子</ceb:itemName>\n" +
+                "\t\t\t<ceb:itemDescribe>小米盒子</ceb:itemDescribe>\n" +
+                "\t\t\t<ceb:barCode>2345123</ceb:barCode>\n" +
+                "\t\t\t<ceb:unit>aaa</ceb:unit>\n" +
+                "\t\t\t<ceb:currency>aaa</ceb:currency>\n" +
+                "\t\t\t<ceb:qty>100</ceb:qty>\n" +
+                "\t\t\t<ceb:price>20</ceb:price>\n" +
+                "\t\t\t<ceb:totalPrice>2000</ceb:totalPrice>\n" +
+                "\t\t\t<ceb:note>test</ceb:note>\n" +
+                "\t\t</ceb:OrderList>\n" +
+                "\t</ceb:Order>\n" +
+                "    <ceb:Order>\n" +
+                "\t\t<ceb:OrderHead>\n" +
+                "\t\t\t<ceb:guid>704ea0f1-b229-4e89-9f2f-c2e550e95c86</ceb:guid>\n" +
+                "\t\t\t<ceb:appType>1</ceb:appType>\n" +
+                "\t\t\t<ceb:appTime>20180507153001</ceb:appTime>\n" +
+                "\t\t\t<ceb:appStatus>2</ceb:appStatus>\n" +
+                "\t\t\t<ceb:orderType>E</ceb:orderType>\n" +
+                "\t\t\t<ceb:orderNo>order2018050711340001</ceb:orderNo>\n" +
+                "\t\t\t<ceb:ebpCode>1105910159</ceb:ebpCode>\n" +
+                "\t\t\t<ceb:ebpName>东方物通科技(北京)有限公司</ceb:ebpName>\n" +
+                "\t\t\t<ceb:ebcCode>1105910159</ceb:ebcCode>\n" +
+                "\t\t\t<ceb:ebcName>东方物通科技(北京)有限公司</ceb:ebcName>\n" +
+                "\t\t\t<ceb:goodsValue>12345678912345.12345</ceb:goodsValue>\n" +
+                "\t\t\t<ceb:freight>0</ceb:freight>\n" +
+                "\t\t\t<ceb:currency>142</ceb:currency>\n" +
+                "\t\t\t<ceb:note>test</ceb:note>\n" +
+                "\t\t</ceb:OrderHead>\n" +
+                "\t\t<ceb:OrderList>\n" +
+                "\t\t\t<ceb:gnum>1</ceb:gnum>\n" +
+                "\t\t\t<ceb:itemNo>AF001-001</ceb:itemNo>\n" +
+                "\t\t\t<ceb:itemName>小米盒子</ceb:itemName>\n" +
+                "\t\t\t<ceb:itemDescribe>小米盒子</ceb:itemDescribe>\n" +
+                "\t\t\t<ceb:barCode>2345123</ceb:barCode>\n" +
+                "\t\t\t<ceb:unit>aaa</ceb:unit>\n" +
+                "\t\t\t<ceb:currency>aaa</ceb:currency>\n" +
+                "\t\t\t<ceb:qty>100</ceb:qty>\n" +
+                "\t\t\t<ceb:price>20</ceb:price>\n" +
+                "\t\t\t<ceb:totalPrice>2000</ceb:totalPrice>\n" +
+                "\t\t\t<ceb:note>test</ceb:note>\n" +
+                "\t\t</ceb:OrderList>\n" +
+                "\t</ceb:Order>\n" +
+                "\t<ceb:BaseTransfer>\n" +
+                "\t\t<ceb:copCode>1105910159</ceb:copCode>\n" +
+                "\t\t<ceb:copName>东方物通科技(北京)有限公司</ceb:copName>\n" +
+                "\t\t<ceb:dxpMode>DXP</ceb:dxpMode>\n" +
+                "\t\t<ceb:dxpId>DXPLGS0000000001</ceb:dxpId>\n" +
+                "\t\t<ceb:note>test</ceb:note>\n" +
+                "\t</ceb:BaseTransfer>\n" +
+                "\t<ceb:BaseTransfer>\n" +
+                "\t\t<ceb:copCode>1105910159</ceb:copCode>\n" +
+                "\t\t<ceb:copName>东方物通科技(北京)有限公司</ceb:copName>\n" +
+                "\t\t<ceb:dxpMode>DXP</ceb:dxpMode>\n" +
+                "\t\t<ceb:dxpId>DXPLGS0000000001</ceb:dxpId>\n" +
+                "\t\t<ceb:note>test</ceb:note>\n" +
+                "\t</ceb:BaseTransfer>\n" +
+                "\t<ds:Signature xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\">\n" +
+                "<ds:SignedInfo>\n" +
+                "<ds:CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"></ds:CanonicalizationMethod>\n" +
+                "<ds:SignatureMethod Algorithm=\"http://www.chinaport.gov.cn/2022/04/xmldsig#sm2-sm3\"></ds:SignatureMethod>\n" +
+                "<ds:Reference URI=\"\">\n" +
+                "<ds:Transforms>\n" +
+                "<ds:Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"></ds:Transform>\n" +
+                "</ds:Transforms>\n" +
+                "<ds:DigestMethod Algorithm=\"http://www.chinaport.gov.cn/2022/04/xmldsig#sm3\"></ds:DigestMethod>\n" +
+                "<ds:DigestValue>SF/P+2sVsRQ9dJIqJSroW6ajb0Y=</ds:DigestValue>\n" +
+                "</ds:Reference>\n" +
+                "</ds:SignedInfo>\n" +
+                "<ds:SignatureValue>\n" +
+                "AI0wdcUHaaOR+FZ7W8lN6FrjzS+iru1qoBTCxm4S6knmLFLunPkLueELV69nYZr4x+uCPnNDD/wq\n" +
+                "jSqyPnH2xrrx8EFvsIhxNMCi+IlfS1z440YmeMEXnhff0pxSBGgrhETrq1tqp6QBZE5siBF4ow10\n" +
+                "0Q9RKaB+OMs4AB6I+0g=\n" +
+                "</ds:SignatureValue>\n" +
+                "<ds:KeyInfo>\n" +
+                "<ds:KeyName>0001</ds:KeyName>\n" +
+                "<ds:X509Data>\n" +
+                "<ds:X509Certificate>\n" +
+                "MIIEWzCCA8SgAwIBAgIDAJknMA0GCSqGSIb3DQEBBQUAMHYxCzAJBgNVBAYTAmNuMREwDwYDVQQK\n" +
+                "Hgh1NVtQU+NcuDENMAsGA1UECx4EAEMAQTENMAsGA1UECB4EUxdOrDEjMCEGA1UEAx4aTi1W/XU1\n" +
+                "W1BT41y4ZXBjbk4tX8NfAFPRUzoxETAPBgNVBAceCE4cZblef1c6MB4XDTE1MDUxOTAwMDAwMFoX\n" +
+                "DTQ5MTIwODAwMDAwMFowJTEjMCEGA1UEAx4aADEAM1P3W8aUpW1Li9VnDVKhVmhfAFPRUzowgZ8w\n" +
+                "DQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKoQc7txXMb5VuXJnALpKQ1mAxFW2hxPwRhXY0mirNIL\n" +
+                "2gLY2z7ysqRvkpSRzr3BEq97xWLlXkQDG1QnzvTvh1YQzrffARSlCy6dYJ3YgM+Bps2NsPXhw1Lk\n" +
+                "vk0wn7LXAskEbwRgLihu1pH6/IGEocgeFusWTXT6B/ppTiEXL/87AgMBAAGjggJGMIICQjALBgNV\n" +
+                "HQ8EBAMCBsAwCQYDVR0TBAIwADCBoAYDVR0jBIGYMIGVgBQsaDiQrlh9ryILr2BYMK/wvmRvlqF6\n" +
+                "pHgwdjELMAkGA1UEBhMCY24xETAPBgNVBAoeCHU1W1BT41y4MQ0wCwYDVQQLHgQAQwBBMQ0wCwYD\n" +
+                "VQQIHgRTF06sMSMwIQYDVQQDHhpOLVb9dTVbUFPjXLhlcGNuTi1fw18AU9FTOjERMA8GA1UEBx4I\n" +
+                "ThxluV5/VzqCASUwHQYDVR0OBBYEFPcD90hfpSLKzuhaE3NvhU1xwHDAMEIGA1UdIAQ7MDkwNwYG\n" +
+                "K4EHAQECMC0wKwYIKwYBBQUHAgEWH2h0dHA6Ly9jcHMuY2hpbmFwb3J0Lmdvdi5jbi9DUFMwQgYD\n" +
+                "VR0fBDswOTA3oDWgM4YxaHR0cDovL2xkYXAuY2hpbmFwb3J0Lmdvdi5jbjo4MDg4L2R6a2EwMDAt\n" +
+                "MTk2LmNybDA9BggrBgEFBQcBAQQxMC8wLQYIKwYBBQUHMAGGIWh0dHA6Ly9vY3NwLmNoaW5hcG9y\n" +
+                "dC5nb3YuY246ODA4ODAqBgorBgEEAalDZAUBBBwWGtbQufq159fTv9qwtsr9vt3W0NDEv6q3osf4\n" +
+                "MBoGCisGAQQBqUNkBQYEDBYKUzAyMDEyMDAzODAaBgorBgEEAalDZAUJBAwWClMwMjAxMjAwMzgw\n" +
+                "EgYKKwYBBAGpQ2QCBAQEFgJDQTASBgorBgEEAalDZAIBBAQWAjE5MBMGBSpWCwcFBAoWCLXn19O/\n" +
+                "2rC2MA0GCSqGSIb3DQEBBQUAA4GBAFqdOOqCs/0zfJj5NM3UPXzAK/yIyx6b8ZEQXuY/aojzE46Q\n" +
+                "QXX1/N+G3DsKPvUhXQj1mAsZQeT0aMiUa1aNCd0P8p+PsfrB9E5oZnFhp4cLDkkuh2gx+MCFOHe2\n" +
+                "oEbi2/nCZpvWRJ34id5szTIw1n96/nrrg2+qFk+ddFr0xRzz\n" +
+                "</ds:X509Certificate>\n" +
+                "</ds:X509Data>\n" +
+                "</ds:KeyInfo>\n" +
+                "</ds:Signature>\n" +
+                "</ceb:CEB303Message>";
+
+
+
+
+
+
+
+
+
+
+
+        // XMLString转Map
+        System.out.println(xml);
+        Map<String, Object> map = XmlUtil.xmlToMap(xml);
+        System.out.println(JSONUtil.toJsonStr(map));
+
+        // map解析
+        Document ceb = XmlUtil.mapToXml(map, "ceb:CEB303Message");
+        // 添加首个Node的属性
+        Element element = ceb.getDocumentElement();
+        element.setAttribute("guid", "311af125-6fed-4603-8c5d-49b1fa4b4b9b");
+        element.setAttribute("version", "1.0");
+        element.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+        element.setAttribute("xmlns:ceb", "http://www.chinaport.gov.cn/ceb");
+        ceb.setXmlStandalone(true);
+        // 转String
+        String xmlString = XmlUtil.toStr(ceb);
+        System.out.println();
+
+        //requestMsg.setBaseTransfer();
+    }
+}

buyer-api/src/test/resources/application.yml

@@ -179,10 +179,12 @@ logging:
   file:
     # 指定路径
     path: lili-logs
-    # 最大保存天数
-    max-history: 7
-    # 每个文件最大大小
-    max-size: 5MB
+  logback:
+    rollingpolicy:
+      # 最大保存天数
+      max-history: 7
+      # 每个文件最大大小
+      max-file-size: 5MB
 #加密参数
 jasypt:
   encryptor:

framework/pom.xml

@@ -1,419 +1,418 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>cn.lili</groupId>
-        <artifactId>lili-shop-parent</artifactId>
-        <version>${revision}</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>framework</artifactId>
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-properties-migrator</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!--定时任务-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-quartz</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>log4j-to-slf4j</artifactId>
-                    <groupId>org.apache.logging.log4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>HdrHistogram</artifactId>
-                    <groupId>org.hdrhistogram</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-redis</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-pool2</artifactId>
-        </dependency>
-        <!--        &lt;!&ndash; Websocket &ndash;&gt;-->
-        <!--        <dependency>-->
-        <!--            <groupId>org.springframework.boot</groupId>-->
-        <!--            <artifactId>spring-boot-starter-websocket</artifactId>-->
-        <!--        </dependency>-->
-        <!-- MybatisPlus -->
-        <dependency>
-            <groupId>com.baomidou</groupId>
-            <artifactId>mybatis-plus-boot-starter</artifactId>
-            <version>${mybatis-plus-version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <!-- Redis-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/org.redisson/redisson-spring-boot-starter -->
-        <dependency>
-            <groupId>org.redisson</groupId>
-            <artifactId>redisson</artifactId>
-            <version>${redisson}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-spring-boot-starter</artifactId>
-            <version>${knife4j.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- Hutool工具包 -->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>${Hutool-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.github.biezhi</groupId>
-            <artifactId>TinyPinyin</artifactId>
-            <version>${TinyPinyin-verions}</version>
-        </dependency>
-        <!-- Lombok -->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok-version}</version>
-        </dependency>
-        <!-- Jasypt加密 -->
-        <dependency>
-            <groupId>com.github.ulisesbocchio</groupId>
-            <artifactId>jasypt-spring-boot-starter</artifactId>
-            <version>${jasypt-version}</version>
-        </dependency>
-        <!-- 阿里云核心包-->
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>aliyun-java-sdk-core</artifactId>
-            <version>${aliyun-version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- 阿里云OSS -->
-        <dependency>
-            <groupId>com.aliyun.oss</groupId>
-            <artifactId>aliyun-sdk-oss</artifactId>
-            <version>${aliyun-sdk-oss-version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>aliyun-java-sdk-core</artifactId>
-                    <groupId>com.aliyun</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.aliyun</groupId>
-            <artifactId>dysmsapi20170525</artifactId>
-            <version>${aliyun-sdk-dysms-version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>org.jacoco.agent</artifactId>
-                    <groupId>org.jacoco</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                    <groupId>org.bouncycastle</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!--脚本编程-->
-        <dependency>
-            <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy</artifactId>
-        </dependency>
-        <!-- rocketmq-spring-boot-starter -->
-        <dependency>
-            <groupId>org.apache.rocketmq</groupId>
-            <artifactId>rocketmq-spring-boot-starter</artifactId>
-            <version>${rocketmq-version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>fastjson</artifactId>
-                    <groupId>com.alibaba</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!--   token加密 -->
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-api</artifactId>
-            <version>${jwt-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-impl</artifactId>
-            <version>${jwt-version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-jackson</artifactId>
-            <version>${jwt-version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <!--test-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!-- 解决版本提示问题 -->
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4</artifactId>
-            <version>${antlr4-version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-
-
-        <!--sharding jdbc springboot-->
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
-            <version>${sharding-jdbc-version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>groovy</artifactId>
-                    <groupId>org.codehaus.groovy</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-collections4</artifactId>
-                    <groupId>org.apache.commons</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>antlr4-runtime</artifactId>
-                    <groupId>org.antlr</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>sharding-jdbc-spring-namespace</artifactId>
-            <version>${sharding-jdbc-version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!--druid-->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid</artifactId>
-            <version>${druid-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.xkcoding.http</groupId>
-            <artifactId>simple-http</artifactId>
-            <version>${simple-http-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4-runtime</artifactId>
-            <version>${antlr4-runtime-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alipay.sdk</groupId>
-            <artifactId>alipay-sdk-java</artifactId>
-            <version>${alipay-sdk-version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>bcprov-jdk15on</artifactId>
-                    <groupId>org.bouncycastle</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>xml-apis</artifactId>
-                    <groupId>xml-apis</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <!--用户端类型处理-->
-        <dependency>
-            <groupId>eu.bitwalker</groupId>
-            <artifactId>UserAgentUtils</artifactId>
-            <version>${userAgentUtils}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>${poi-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>${poi-ooxml-version}</version>
-        </dependency>
-        <!--集成logstash-->
-        <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-            <version>${logstash-logback-encoder}</version>
-        </dependency>
-        <dependency>
-            <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>${de.codecentric}</version>
-        </dependency>
-        <!-- 开源多维码生成工具 -->
-        <dependency>
-            <groupId>com.google.zxing</groupId>
-            <artifactId>core</artifactId>
-            <version>${zxing}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.zxing</groupId>
-            <artifactId>javase</artifactId>
-            <version>${zxing}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>${slf4j-api}</version>
-        </dependency>
-        <!-- 开源多维码生成工具 -->
-        <dependency>
-            <groupId>com.github.xkzhangsan</groupId>
-            <artifactId>xk-time</artifactId>
-            <version>${xk-time}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>${commons-text}</version>
-        </dependency>
-        <!-- https://mvnrepository.com/artifact/com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer -->
-        <dependency>
-            <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
-            <artifactId>owasp-java-html-sanitizer</artifactId>
-            <version>${owasp-java-html-sanitizer}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-    </dependencies>
-
-
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>cn.lili</groupId>
+        <artifactId>lili-shop-parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>framework</artifactId>
+    <packaging>jar</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-properties-migrator</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.hamcrest</groupId>
+                    <artifactId>hamcrest-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--定时任务-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>log4j-to-slf4j</artifactId>
+                    <groupId>org.apache.logging.log4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>HdrHistogram</artifactId>
+                    <groupId>org.hdrhistogram</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-redis</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+        <!--        &lt;!&ndash; Websocket &ndash;&gt;-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework.boot</groupId>-->
+        <!--            <artifactId>spring-boot-starter-websocket</artifactId>-->
+        <!--        </dependency>-->
+        <!-- MybatisPlus -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
+            <version>${mybatis-plus-version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Mysql Connector -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <!-- Redis-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.redisson/redisson-spring-boot-starter -->
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson</artifactId>
+            <version>${redisson}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>${knife4j.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Hutool工具包 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>${Hutool-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.github.biezhi</groupId>
+            <artifactId>TinyPinyin</artifactId>
+            <version>${TinyPinyin-verions}</version>
+        </dependency>
+        <!-- Lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok-version}</version>
+        </dependency>
+        <!-- Jasypt加密 -->
+        <dependency>
+            <groupId>com.github.ulisesbocchio</groupId>
+            <artifactId>jasypt-spring-boot-starter</artifactId>
+            <version>${jasypt-version}</version>
+        </dependency>
+        <!-- 阿里云核心包-->
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>aliyun-java-sdk-core</artifactId>
+            <version>${aliyun-version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- 阿里云OSS -->
+        <dependency>
+            <groupId>com.aliyun.oss</groupId>
+            <artifactId>aliyun-sdk-oss</artifactId>
+            <version>${aliyun-sdk-oss-version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>aliyun-java-sdk-core</artifactId>
+                    <groupId>com.aliyun</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.aliyun</groupId>
+            <artifactId>dysmsapi20170525</artifactId>
+            <version>${aliyun-sdk-dysms-version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>org.jacoco.agent</artifactId>
+                    <groupId>org.jacoco</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                    <groupId>org.bouncycastle</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--脚本编程-->
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+        </dependency>
+        <!-- rocketmq-spring-boot-starter -->
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-spring-boot-starter</artifactId>
+            <version>${rocketmq-version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>fastjson</artifactId>
+                    <groupId>com.alibaba</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--   token加密 -->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <version>${jwt-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>${jwt-version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
+            <version>${jwt-version}</version>
+            <scope>runtime</scope>
+        </dependency>
+        <!--test-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- 解决版本提示问题 -->
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4</artifactId>
+            <version>${antlr4-version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+
+        <!--sharding jdbc springboot-->
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
+            <version>${sharding-jdbc-version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>groovy</artifactId>
+                    <groupId>org.codehaus.groovy</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-collections4</artifactId>
+                    <groupId>org.apache.commons</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>antlr4-runtime</artifactId>
+                    <groupId>org.antlr</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.shardingsphere</groupId>
+            <artifactId>sharding-jdbc-spring-namespace</artifactId>
+            <version>${sharding-jdbc-version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>slf4j-api</artifactId>
+                    <groupId>org.slf4j</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!--druid-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>${druid-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.xkcoding.http</groupId>
+            <artifactId>simple-http</artifactId>
+            <version>${simple-http-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.antlr</groupId>
+            <artifactId>antlr4-runtime</artifactId>
+            <version>${antlr4-runtime-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+            <version>${alipay-sdk-version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>bcprov-jdk15on</artifactId>
+                    <groupId>org.bouncycastle</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>xml-apis</artifactId>
+                    <groupId>xml-apis</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!--用户端类型处理-->
+        <dependency>
+            <groupId>eu.bitwalker</groupId>
+            <artifactId>UserAgentUtils</artifactId>
+            <version>${userAgentUtils}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>${poi-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>${poi-ooxml-version}</version>
+        </dependency>
+        <!--集成logstash-->
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>${logstash-logback-encoder}</version>
+        </dependency>
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${de.codecentric}</version>
+        </dependency>
+        <!-- 开源多维码生成工具 -->
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>${zxing}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>${zxing}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${slf4j-api}</version>
+        </dependency>
+        <!-- 开源多维码生成工具 -->
+        <dependency>
+            <groupId>com.github.xkzhangsan</groupId>
+            <artifactId>xk-time</artifactId>
+            <version>${xk-time}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>${commons-text}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.googlecode.owasp-java-html-sanitizer/owasp-java-html-sanitizer -->
+        <dependency>
+            <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+            <artifactId>owasp-java-html-sanitizer</artifactId>
+            <version>${owasp-java-html-sanitizer}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>guava</artifactId>
+                    <groupId>com.google.guava</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+    </dependencies>
+
 </project>

framework/src/main/java/cn/lili/common/enums/HTTPMethodEnum.java

@@ -0,0 +1,12 @@
+package cn.lili.common.enums;
+
+public enum HTTPMethodEnum {
+    GET,
+    POST,
+    PUT,
+    DELETE,
+    OPTIONS,
+    HEAD,
+    TRACE,
+    CONNECT
+}

framework/src/main/java/cn/lili/common/enums/JGS20Unit.java

@@ -0,0 +1,161 @@
+package cn.lili.common.enums;
+
+import cn.lili.common.exception.UnitIllegalException;
+
+import java.util.stream.Stream;
+
+/**
+ * JGS-20海关业务代码集 - 计量单位代码
+ * @ref http://www.servicetree.cn/?p=456
+ */
+public enum JGS20Unit {
+    UNIT001("台", "001"),
+    UNIT002("座", "002"),
+    UNIT003("辆", "003"),
+    UNIT004("艘", "004"),
+    UNIT005("架", "005"),
+    UNIT006("套", "006"),
+    UNIT007("个", "007"),
+    UNIT008("只", "008"),
+    UNIT009("头", "009"),
+    UNIT010("张", "010"),
+    UNIT011("件", "011"),
+    UNIT012("支", "012"),
+    UNIT013("枝", "013"),
+    UNIT014("根", "014"),
+    UNIT015("条", "015"),
+    UNIT016("把", "016"),
+    UNIT017("块", "017"),
+    UNIT018("卷", "018"),
+    UNIT019("副", "019"),
+    UNIT020("片", "020"),
+    UNIT021("组", "021"),
+    UNIT022("份", "022"),
+    UNIT023("幅", "023"),
+    UNIT025("双", "025"),
+    UNIT026("对", "026"),
+    UNIT027("棵", "027"),
+    UNIT028("株", "028"),
+    UNIT029("井", "029"),
+    UNIT030("米", "030"),
+    UNIT031("盘", "031"),
+    UNIT032("平方米", "032"),
+    UNIT033("立方米", "033"),
+    UNIT034("筒", "034"),
+    UNIT035("千克", "035"),
+    UNIT036("克", "036"),
+    UNIT037("盆", "037"),
+    UNIT038("万个", "038"),
+    UNIT039("具", "039"),
+    UNIT040("百副", "040"),
+    UNIT041("百支", "041"),
+    UNIT042("百把", "042"),
+    UNIT043("百个", "043"),
+    UNIT044("百片", "044"),
+    UNIT045("刀", "045"),
+    UNIT046("疋", "046"),
+    UNIT047("公担", "047"),
+    UNIT048("扇", "048"),
+    UNIT049("百枝", "049"),
+    UNIT050("千只", "050"),
+    UNIT051("千块", "051"),
+    UNIT052("千盒", "052"),
+    UNIT053("千枝", "053"),
+    UNIT054("千个", "054"),
+    UNIT055("亿支", "055"),
+    UNIT056("亿个", "056"),
+    UNIT057("万套", "057"),
+    UNIT058("千张", "058"),
+    UNIT059("万张", "059"),
+    UNIT060("千伏安", "060"),
+    UNIT061("千瓦", "061"),
+    UNIT062("千瓦时", "062"),
+    UNIT063("千升", "063"),
+    UNIT067("英尺", "067"),
+    UNIT070("吨", "070"),
+    UNIT071("长吨", "071"),
+    UNIT072("短吨", "072"),
+    UNIT073("司马担", "073"),
+    UNIT074("司马斤", "074"),
+    UNIT075("斤", "075"),
+    UNIT076("磅", "076"),
+    UNIT077("担", "077"),
+    UNIT078("英担", "078"),
+    UNIT079("短担", "079"),
+    UNIT080("两", "080"),
+    UNIT081("市担", "081"),
+    UNIT083("盎司", "083"),
+    UNIT084("克拉", "084"),
+    UNIT085("市尺", "085"),
+    UNIT086("码", "086"),
+    UNIT088("英寸", "088"),
+    UNIT089("寸", "089"),
+    UNIT095("升", "095"),
+    UNIT096("毫升", "096"),
+    UNIT097("英加仑", "097"),
+    UNIT098("美加仑", "098"),
+    UNIT099("立方英尺", "099"),
+    UNIT101("立方尺", "101"),
+    UNIT110("平方码", "110"),
+    UNIT111("平方英尺", "111"),
+    UNIT112("平方尺", "112"),
+    UNIT115("英制马力", "115"),
+    UNIT116("公制马力", "116"),
+    UNIT118("令", "118"),
+    UNIT120("箱", "120"),
+    UNIT121("批", "121"),
+    UNIT122("罐", "122"),
+    UNIT123("桶", "123"),
+    UNIT124("扎", "124"),
+    UNIT125("包", "125"),
+    UNIT126("箩", "126"),
+    UNIT127("打", "127"),
+    UNIT128("筐", "128"),
+    UNIT129("罗", "129"),
+    UNIT130("匹", "130"),
+    UNIT131("册", "131"),
+    UNIT132("本", "132"),
+    UNIT133("发", "133"),
+    UNIT134("枚", "134"),
+    UNIT135("捆", "135"),
+    UNIT136("袋", "136"),
+    UNIT139("粒", "139"),
+    UNIT140("盒", "140"),
+    UNIT141("合", "141"),
+    UNIT142("瓶", "142"),
+    UNIT143("千支", "143"),
+    UNIT144("万双", "144"),
+    UNIT145("万粒", "145"),
+    UNIT146("千粒", "146"),
+    UNIT147("千米", "147"),
+    UNIT148("千英尺", "148"),
+    UNIT149("百万贝可", "149"),
+    UNIT163("部", "163"),
+    UNIT164("亿株", "164");
+
+    JGS20Unit(String cnName, String code) {
+        this.cnName = cnName;
+        this.code = code;
+    }
+
+    /**
+     * 根据中文名称获取
+     * @param cnName 中文名称
+     * @return JGS-20 标准单位
+     */
+    public static JGS20Unit ofCnName(String cnName){
+        return Stream.of(values())
+                .filter(unit -> unit.cnName.equals(cnName))
+                .findFirst()
+                .orElseThrow(UnitIllegalException::new);
+    }
+
+    /**
+     * 中文名称
+     */
+    public String cnName;
+    /**
+     * 计量单位代码
+     */
+    public String code;
+}

framework/src/main/java/cn/lili/common/enums/ResultCode.java

@@ -181,6 +181,7 @@ public enum ResultCode {
     ORDER_BATCH_DELIVER_ERROR(31013, "批量发货,文件读取失败"),
     ORDER_ITEM_NOT_EXIST(31014, "当前订单项不存在！"),
     POINT_NOT_ENOUGH(31015, "当前会员积分不足购买当前积分商品！"),
+    ORDER_CUSTOMS_ERROR(31016, "订单推送海关失败"),
 
 
     /**

framework/src/main/java/cn/lili/common/exception/UnitIllegalException.java

@@ -0,0 +1,12 @@
+package cn.lili.common.exception;
+
+import lombok.Data;
+
+@Data
+public class UnitIllegalException extends RuntimeException {
+
+    /**
+     * 异常消息
+     */
+    private String msg = "单位转换失败，请检查单位信息维护是否遵照JGS-20标准，参考网址：http://www.servicetree.cn/?p=456";
+}

framework/src/main/java/cn/lili/common/properties/AbstractHttpEndPointProperties.java

@@ -0,0 +1,18 @@
+package cn.lili.common.properties;
+
+import cn.lili.common.enums.HTTPMethodEnum;
+
+public abstract class AbstractHttpEndPointProperties {
+
+    /** 主机域名或IP */
+    public String host;
+
+    /** 端口 */
+    public Integer port;
+
+    /** 路由 */
+    public String path;
+
+    /** HTTP方法 */
+    public HTTPMethodEnum method;
+}

framework/src/main/java/cn/lili/common/properties/holder/PlatformIntergrationHolder.java

@@ -0,0 +1,4 @@
+package cn.lili.common.properties.holder;
+
+public class PlatformIntergrationHolder {
+}

framework/src/main/java/cn/lili/common/properties/httpEndPointProperties.java

@@ -0,0 +1,11 @@
+package cn.lili.common.properties;
+
+import cn.lili.common.enums.HTTPMethodEnum;
+
+public interface httpEndPointProperties {
+
+    String url();
+
+    HTTPMethodEnum method();
+
+}

framework/src/main/java/cn/lili/common/utils/AesEncrypt.java

@@ -0,0 +1,133 @@
+package cn.lili.common.utils;
+
+import javax.crypto.*;
+import javax.crypto.spec.SecretKeySpec;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+
+public class AesEncrypt {
+    public AesEncrypt() {
+    }
+
+    public static String encrypt(String content, String password) {
+        try {
+            KeyGenerator kgen = KeyGenerator.getInstance("AES");
+            // 防止Linux下随机生成Key
+            SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+            secureRandom.setSeed(password.getBytes());
+            kgen.init(128, secureRandom);
+            // kgen.init(128, new SecureRandom(password.getBytes()));
+            SecretKey secretKey = kgen.generateKey();
+            byte[] enCodeFormat = secretKey.getEncoded();
+            SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");
+            Cipher cipher = Cipher.getInstance("AES");
+            byte[] byteContent = content.getBytes("utf-8");
+            cipher.init(1, key);
+            byte[] result = cipher.doFinal(byteContent);
+            return parseByte2HexStr(result);
+        } catch (NoSuchAlgorithmException var9) {
+            var9.printStackTrace();
+        } catch (NoSuchPaddingException var10) {
+            var10.printStackTrace();
+        } catch (InvalidKeyException var11) {
+            var11.printStackTrace();
+        } catch (UnsupportedEncodingException var12) {
+            var12.printStackTrace();
+        } catch (IllegalBlockSizeException var13) {
+            var13.printStackTrace();
+        } catch (BadPaddingException var14) {
+            var14.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public static String decrypt(String encrypt, String password) {
+        try {
+            byte[] decode = parseHexStr2Byte(encrypt);
+            KeyGenerator kgen = KeyGenerator.getInstance("AES");
+            // 防止Linux下随机生成Key
+            SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG");
+            secureRandom.setSeed(password.getBytes());
+            kgen.init(128, secureRandom);
+            SecretKey secretKey = kgen.generateKey();
+            byte[] enCodeFormat = secretKey.getEncoded();
+            SecretKeySpec key = new SecretKeySpec(enCodeFormat, "AES");
+            Cipher cipher = Cipher.getInstance("AES");
+            cipher.init(2, key);
+            byte[] result = cipher.doFinal(decode);
+            return new String(result, StandardCharsets.UTF_8);
+        } catch (NoSuchAlgorithmException var9) {
+            var9.printStackTrace();
+        } catch (NoSuchPaddingException var10) {
+            var10.printStackTrace();
+        } catch (InvalidKeyException var11) {
+            var11.printStackTrace();
+        } catch (IllegalBlockSizeException var12) {
+            var12.printStackTrace();
+        } catch (BadPaddingException var13) {
+            var13.printStackTrace();
+        }
+
+        return null;
+    }
+
+    private static String parseByte2HexStr(byte[] buf) {
+        StringBuffer sb = new StringBuffer();
+
+        for(int i = 0; i < buf.length; ++i) {
+            String hex = Integer.toHexString(buf[i] & 255);
+            if (hex.length() == 1) {
+                hex = '0' + hex;
+            }
+
+            sb.append(hex.toUpperCase());
+        }
+
+        return sb.toString();
+    }
+
+    private static byte[] parseHexStr2Byte(String hexStr) {
+        if (hexStr.length() < 1) {
+            return null;
+        } else {
+            byte[] result = new byte[hexStr.length() / 2];
+
+            for(int i = 0; i < hexStr.length() / 2; ++i) {
+                int high = Integer.parseInt(hexStr.substring(i * 2, i * 2 + 1), 16);
+                int low = Integer.parseInt(hexStr.substring(i * 2 + 1, i * 2 + 2), 16);
+                result[i] = (byte)(high * 16 + low);
+            }
+
+            return result;
+        }
+    }
+
+    public static byte[] encrypt2(String content, String password) {
+        try {
+            SecretKeySpec key = new SecretKeySpec(password.getBytes(), "AES");
+            Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding");
+            byte[] byteContent = content.getBytes("utf-8");
+            cipher.init(1, key);
+            byte[] result = cipher.doFinal(byteContent);
+            return result;
+        } catch (NoSuchAlgorithmException var6) {
+            var6.printStackTrace();
+        } catch (NoSuchPaddingException var7) {
+            var7.printStackTrace();
+        } catch (InvalidKeyException var8) {
+            var8.printStackTrace();
+        } catch (UnsupportedEncodingException var9) {
+            var9.printStackTrace();
+        } catch (IllegalBlockSizeException var10) {
+            var10.printStackTrace();
+        } catch (BadPaddingException var11) {
+            var11.printStackTrace();
+        }
+
+        return null;
+    }
+}

framework/src/main/java/cn/lili/common/utils/JaxbUtils.java

@@ -0,0 +1,77 @@
+package cn.lili.common.utils;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * java2xml 工具类
+ */
+public class JaxbUtils {
+    /**
+     * JavaBean转换成xml
+     * 默认编码UTF-8
+     *
+     * @param obj
+     * @return
+     */
+    public static String convertToXml(Object obj) {
+        return convertToXml(obj, "UTF-8");
+    }
+
+    /**
+     * JavaBean转换成xml
+     *
+     * @param obj
+     * @param encoding
+     * @return
+     */
+    public static String convertToXml(Object obj, String encoding) {
+        String result = null;
+        try {
+            JAXBContext context = JAXBContext.newInstance(obj.getClass());
+            Marshaller marshaller = context.createMarshaller();
+            //格式化xml格式
+            marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+
+            marshaller.setProperty(Marshaller.JAXB_ENCODING, encoding);
+            //去掉生成xml的默认报文头
+            marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
+
+            StringWriter writer = new StringWriter();
+            // 由于不能优雅的去掉 standalone="yes" 所以只能去掉整个头部，然后手动插入一个符合条件的头部   该行为不优雅需要进行升级
+            writer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>" + "\n");
+            marshaller.marshal(obj, writer);
+            result = writer.toString();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * xml转换成JavaBean
+     *
+     * @param xml
+     * @param c
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T converyToJavaBean(String xml, Class<T> c) {
+        T t = null;
+        try {
+            JAXBContext context = JAXBContext.newInstance(c);
+            Unmarshaller unmarshaller = context.createUnmarshaller();
+            t = (T) unmarshaller.unmarshal(new StringReader(xml));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return t;
+    }
+}
+
+

framework/src/main/java/cn/lili/common/utils/StringUtils.java

@@ -176,6 +176,20 @@ public class StringUtils extends StrUtil {
         return str;
     }
 
+    /**
+     * 查询字符串中首个数字或字母出现的位置
+     * @param str 查询的字符串
+     * @return 若存在，返回位置索引，否则返回-1；
+     */
+    public static int findFirstIdxAlphabetNumber(String str){
+        int i = -1;
+        Matcher matcher = Pattern.compile("[A-Za-z0-9]").matcher(str);
+        if(matcher.find()) {
+            i = matcher.start();
+        }
+        return i;
+    }
+
 }
 
 

framework/src/main/java/cn/lili/common/utils/XmlMapUtils.java

@@ -0,0 +1,273 @@
+package cn.lili.common.utils;
+
+
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.SAXReader;
+import org.dom4j.io.XMLWriter;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.util.*;
+
+
+/**
+ * 提供Map<String,Object>转XML，XML转Map<String,Object>
+ */
+
+
+public class XmlMapUtils {
+
+
+    /**
+     *
+     * 通过Map创建XML,Map可以多层转换
+     *
+     * @param params
+     * @return	String-->XML
+     */
+    public static String createXmlByMap(String parentName,Map<String, Object> params,boolean isCDATA){
+        Document doc = DocumentHelper.createDocument();
+        doc.addElement(parentName);
+        String xml = iteratorXml(doc.getRootElement(),parentName,params,isCDATA);
+        return formatXML(xml);
+    }
+
+    /**
+     *
+     * 通过Map创建XML,Map可以多层转换
+     * 可以自定义parent节点
+     *
+     * @param params
+     * @return	String-->XML
+     */
+    public static String createXmlByMap(String parentName,Map<String, Object> params){
+        Document doc = DocumentHelper.createDocument();
+        doc.addElement(parentName);
+        String xml = iteratorXml(doc.getRootElement(),parentName,params,false);
+        return formatXML(xml);
+    }
+
+    /**
+     *
+     * 通过Map创建XML,Map可以多层转
+     * 固定节点parent为Document
+     *
+     * @param params
+     * @return	String-->XML
+     */
+    public static String createXmlByMap(Map<String, Object> params){
+        String parentName = "Request";
+        Document doc = DocumentHelper.createDocument();
+        doc.addElement(parentName);
+        String xml = iteratorXml(doc.getRootElement(),parentName,params,false);
+        return formatXML(xml);
+    }
+
+    /**
+     *
+     * MapToXml循环遍历创建xml节点
+     * 此方法在value中加入CDATA标识符
+     *
+     * @param element 根节点
+     * @param parentName 子节点名字
+     * @param params map数据
+     * @return String-->Xml
+     */
+
+    @SuppressWarnings("unchecked")
+    public static String iteratorXml(Element element,String parentName,Map<String,Object> params,boolean isCDATA) {
+        Element e = element.addElement(parentName);
+        Set<String> set = params.keySet();
+        for (Iterator<String> it = set.iterator(); it.hasNext();) {
+            String key = (String) it.next();
+            if(params.get(key) instanceof Map) {
+                iteratorXml(e,key,(Map<String,Object>)params.get(key),isCDATA);
+            }else {
+                String value = params.get(key)==null?"":params.get(key).toString();
+                if(!isCDATA) {
+                    e.addElement(key).addText(value);
+                }else {
+                    e.addElement(key).addCDATA(value);
+                }
+            }
+        }
+        return e.asXML();
+    }
+
+    /**
+     * 格式化xml,显示为容易看的XML格式
+     *
+     * @param inputXML
+     * @return
+     */
+    public static String formatXML(String inputXML){
+        String requestXML = null;
+        XMLWriter writer = null;
+        Document document = null;
+        try {
+            SAXReader reader = new SAXReader();
+            document = reader.read(new StringReader(inputXML));
+            if (document != null) {
+                StringWriter stringWriter = new StringWriter();
+                OutputFormat format = new OutputFormat("	", true);//格式化，每一级前的空格
+                format.setNewLineAfterDeclaration(false);	//xml声明与内容是否添加空行
+                format.setSuppressDeclaration(false);		//是否设置xml声明头部
+                format.setNewlines(true);		//设置分行
+                writer = new XMLWriter(stringWriter, format);
+                writer.write(document);
+                writer.flush();
+                requestXML = stringWriter.getBuffer().toString();
+            }
+            return requestXML;
+        } catch (Exception e1) {
+            e1.printStackTrace();
+            return null;
+        }finally {
+            if (writer != null) {
+                try {
+                    writer.close();
+                } catch (IOException e) {
+
+                }
+            }
+        }
+    }
+
+
+    /**
+     *
+     * 通过XML转换为Map<String,Object>
+     *
+     * @param xml 为String类型的Xml
+     * @return 第一个为Root节点，Root节点之后为Root的元素，如果为多层，可以通过key获取下一层Map
+     */
+    public static Map<String, Object> createMapByXml(String xml) {
+        Document doc = null;
+        try {
+            doc = DocumentHelper.parseText(xml);
+        } catch (DocumentException e) {
+            e.printStackTrace();
+        }
+        Map<String, Object> map = new HashMap<String, Object>();
+        if (doc == null)
+            return map;
+        Element rootElement = doc.getRootElement();
+        elementTomap(rootElement,map);
+        return map;
+    }
+
+    /***
+     *
+     * XmlToMap核心方法，里面有递归调用
+     *
+     * @param outele
+     * @param outmap
+     */
+    @SuppressWarnings("unchecked")
+    public static Map<String, Object> elementTomap (Element outele,Map<String,Object> outmap) {
+        List<Element> list = outele.elements();
+        int size = list.size();
+        if(size == 0){
+            outmap.put(outele.getName(), outele.getTextTrim());
+        }else{
+            Map<String, Object> innermap = new HashMap<String, Object>();
+            for(Element ele1 : list){
+                String eleName = ele1.getName();
+                Object obj =  innermap.get(eleName);
+                if(obj == null){
+                    elementTomap(ele1,innermap);
+                }else{
+                    if(obj instanceof java.util.Map){
+                        List<Map<String, Object>> list1 = new ArrayList<Map<String, Object>>();
+                        list1.add((Map<String, Object>) innermap.remove(eleName));
+                        elementTomap(ele1,innermap);
+                        list1.add((Map<String, Object>) innermap.remove(eleName));
+                        innermap.put(eleName, list1);
+                    }else{
+                        elementTomap(ele1,innermap);
+                        ((List<Map<String, Object>>)obj).add(innermap);
+                    }
+                }
+            }
+            outmap.put(outele.getName(), innermap);
+        }
+        return outmap;
+    }
+
+    /**
+     * Map or JSON 转换成Xml
+     *
+     * fastJSON实现了Map<String,Object> 所以此处直接传json 也可以的
+     */
+    public static String mapToXML(Map map, StringBuffer sb) {
+        Set set = map.keySet();
+        for (Iterator it = set.iterator(); it.hasNext(); ) {
+            String key = (String) it.next();
+            Object value = map.get(key);
+            if (null == value)
+                value = "";
+            if (value.getClass().getName().equals("java.util.ArrayList")) {
+                List list = (List) map.get(key);
+                sb.append("<" + key + ">");
+                for (int i = 0; i < list.size(); i++) {
+                    HashMap hm = (HashMap) list.get(i);
+                    mapToXML(hm, sb);
+                }
+                sb.append("</" + key + ">");
+
+            } else {
+                if (value instanceof HashMap) {
+                    sb.append("<" + key + ">");
+                    mapToXML((HashMap) value, sb);
+                    sb.append("</" + key + ">");
+                } else {
+                    sb.append("<" + key + ">" + value + "</" + key + ">");
+                }
+            }
+        }
+//        String xmlString = "<?xml version=\"1.0\" encoding=\"GBK\"?>\n" +
+//                "<Packet type=\"RESPONSE\" version=\"1.0\">\n" +
+//                "    <Head>\n" +
+//                "        <errorCode>00000</errorCode>\n" +
+//                "        <errorMessage>成功</errorMessage>\n" +
+//                "    </Head>\n" +
+//                "    <Body>\n" +
+//                "        <ResInformation>\n" +
+//                "            <User>\n" +
+//                "                <id>1</id>\n" +
+//                "                <name>张三</name>\n" +
+//                "                <age>18</age>\n" +
+//                "                <sex>男</sex>\n" +
+//                "            </User>\n" +
+//                "            <User>\n" +
+//                "                <id>2</id>\n" +
+//                "                <name>李四</name>\n" +
+//                "                <age>20</age>\n" +
+//                "                <sex>女</sex>\n" +
+//                "            </User>\n" +
+//                "            <User>\n" +
+//                "                <id>3</id>\n" +
+//                "                <name>王五</name>\n" +
+//                "                <age>19</age>\n" +
+//                "                <sex>女</sex>\n" +
+//                "            </User>\n" +
+//                "            <School>\n" +
+//                "                <id>3</id>\n" +
+//                "                <province>广东省</province>\n" +
+//                "                <city>深圳市</city>\n" +
+//                "                <name>XXXX大学</name>\n" +
+//                "            </School>\n" +
+//                "        </ResInformation>\n" +
+//                "    </Body>\n" +
+//                "</Packet>\n";
+        return sb.toString();
+    }
+
+}
+
+

framework/src/main/java/cn/lili/modules/order/customs/CustomPayload.java

@@ -0,0 +1,30 @@
+package cn.lili.modules.order.customs;
+
+import lombok.ToString;
+
+@ToString
+public enum CustomPayload {
+    JiangyinXingguang("DXPENT0000474373", "DXP", "江阴星光进出口有限公司", "3216960A23", "dcits123456", "test");
+
+    CustomPayload(String dxpId, String dxpMode, String copName, String copCode, String signKey, String note) {
+        this.dxpId = dxpId;
+        this.dxpMode = dxpMode;
+        this.copName = copName;
+        this.copCode = copCode;
+        this.signKey = signKey;
+        this.note = note;
+    }
+
+    /** 向中国电子口岸数据中心申请数据交换平台的用户编号 */
+    public String dxpId;
+    /** 默认为DXP,指中国电子口岸数据交换平台 */
+    public String dxpMode;
+    /** 报文传输的企业代码（海关编码，需要与接入客户端的企业身份一致） */
+    public String copCode;
+    /** 报文传输的企业名称 */
+    public String copName;
+    /** 签名key */
+    public String signKey;
+    /** 备注 */
+    public String note;
+}

framework/src/main/java/cn/lili/modules/order/customs/CustomsExchange.java

@@ -0,0 +1,21 @@
+package cn.lili.modules.order.customs;
+
+import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CustomsExchange {
+    private String guid;
+
+    private OrderDetailVO orderDetailVO;
+
+    private String appTime;
+
+    private Map<String, String> id2Unit;
+}

framework/src/main/java/cn/lili/modules/order/customs/JiangyinServiceManager.java

@@ -0,0 +1,91 @@
+package cn.lili.modules.order.customs;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.common.utils.AesEncrypt;
+import cn.lili.modules.order.customs.converter.CustomsReqConverter;
+import cn.lili.modules.order.order.entity.dos.Order;
+import cn.lili.modules.order.order.entity.dos.OrderCustoms;
+import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
+import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
+import cn.lili.modules.order.order.mapper.OrderCustomsMapper;
+import cn.lili.modules.order.order.mapper.OrderMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.UUID;
+
+import static cn.lili.common.enums.ResultCode.ORDER_CUSTOMS_ERROR;
+
+@Slf4j
+@Component
+public class JiangyinServiceManager {
+
+    private static final String JIANGYIN_ORDER_PUSH_URL = "http://117.80.148.225:8010/webapi-jiangyin/api/custom/platReceiveOf9710";
+
+    private final CustomsReqConverter converter;
+
+    private final OrderMapper orderMapper;
+
+    private final OrderCustomsMapper orderCustomsMapper;
+
+    @Autowired
+    public JiangyinServiceManager(@Qualifier("jiangyinServiceBeanReqConverter") CustomsReqConverter converter,
+                                  OrderMapper orderMapper,
+                                  OrderCustomsMapper orderCustomsMapper) {
+        this.converter = converter;
+        this.orderMapper = orderMapper;
+        this.orderCustomsMapper = orderCustomsMapper;
+    }
+
+    public boolean push(OrderDetailVO detailVO){
+        Assert.isTrue(!detailVO.getOrder().getCustomsFlag(), () -> new ServiceException(ORDER_CUSTOMS_ERROR,"订单已推送海关，请勿重复推送"));
+        Assert.isTrue(PayStatusEnum.PAID.name().equals(detailVO.getOrder().getPayStatus()),
+                () -> new ServiceException(ORDER_CUSTOMS_ERROR,"订单尚未支付，无法推送海关"));
+        // 企业凭证相关（后续动态获取）
+        CustomPayload payload = CustomPayload.JiangyinXingguang;
+        OrderCustoms customsRec = new OrderCustoms();
+        log.info("method input param: {}, payload: {}", JSONUtil.toJsonStr(detailVO), payload.toString());
+        // 报文内容(密文)
+        CustomsExchange exchange = new CustomsExchange(UUID.randomUUID().toString(), detailVO ,null, null);
+        final String reqMsg = converter.toReq(exchange, payload);
+        System.out.println(reqMsg);
+        customsRec.setReqMsg(reqMsg);
+        String encryptContent = AesEncrypt.encrypt(reqMsg, payload.signKey);
+        // 构建参数
+        JiangyinServiceParam param = JiangyinServiceParam.builder()
+                .signMsg(converter.getSign(encryptContent, payload.signKey))
+                .content(encryptContent)
+                // 唯一序号
+                .copMsgId(detailVO.getOrder().getSn() + DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_PATTERN))
+                .sendCode(payload.copCode)
+                .build();
+        // 开始调用
+        Map<String, Object> paramMap = BeanUtil.beanToMap(param);
+        log.info("request body: {}", paramMap);
+//        String res = "";
+        String res = HttpUtil.post(JIANGYIN_ORDER_PUSH_URL, paramMap, 30000);
+        log.info("response msg: {}", res);
+        customsRec.setResMsg(res);
+        boolean success = converter.checkSuccess(res);
+        if (success){
+            // 推送成功更新订单状态为已推送
+            Order order = exchange.getOrderDetailVO().getOrder();
+            order.setCustomsFlag(true);
+            order.setCustomsGuid(exchange.getGuid());
+            orderMapper.updateById(order);
+        }
+        orderCustomsMapper.insert(customsRec);
+        return success;
+    }
+}
+

framework/src/main/java/cn/lili/modules/order/customs/JiangyinServiceParam.java

@@ -0,0 +1,19 @@
+package cn.lili.modules.order.customs;
+
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class JiangyinServiceParam {
+    /** 数字签名 */
+    String signMsg;
+    /** 报文内容 */
+    String content;
+    /** 消息类型 */
+    final String msgType = "CEB303Message";
+    /** 用户自定义生成报文唯一序号 */
+    String copMsgId;
+    /** 发送方代码（企业海关10位编码） */
+    String sendCode;
+}

framework/src/main/java/cn/lili/modules/order/customs/NameSpace.java

@@ -0,0 +1,29 @@
+package cn.lili.modules.order.customs;
+
+/**
+ * xml 命名空间
+ */
+public class NameSpace {
+
+    /**
+     * order 订单节点
+     */
+    public static final String NAMESPACE_CEB_URI = "http://www.chinaport.gov.cn/ceb";
+
+
+    /**
+     * dep终端节点报文
+     */
+    public static final String NAMESPACE_DXP_URI = "http://www.chinaport.gov.cn/dxp";
+
+    /**
+     * xsi规范
+     */
+    public static final String NAMESPACE_XSI_URI = "http://www.w3.org/2001/XMLSchema-instance";
+
+    /**
+     * 签名节点xml
+     */
+    public static final String NAMESPACE_DS_URL = "http://www.w3.org/2000/09/xmldsig#";
+
+}

framework/src/main/java/cn/lili/modules/order/customs/converter/CustomsReqConverter.java

@@ -0,0 +1,15 @@
+package cn.lili.modules.order.customs.converter;
+
+import cn.lili.modules.order.customs.CustomPayload;
+import cn.lili.modules.order.customs.CustomsExchange;
+
+public interface CustomsReqConverter{
+    /** 生成报文 */
+    String toReq(CustomsExchange exchange, CustomPayload payload);
+
+    /** 获取签名 */
+    String getSign(String content, String key);
+
+    /** 确认响应信息是否成功调用 */
+    boolean checkSuccess(String resStr);
+}

framework/src/main/java/cn/lili/modules/order/customs/converter/JiangyinServiceBeanReqConverter.java

@@ -0,0 +1,72 @@
+package cn.lili.modules.order.customs.converter;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.XmlUtil;
+import cn.hutool.crypto.digest.DigestUtil;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.common.utils.JaxbUtils;
+import cn.lili.modules.goods.entity.dos.Goods;
+import cn.lili.modules.goods.entity.dto.GoodsSearchParams;
+import cn.lili.modules.goods.service.GoodsService;
+import cn.lili.modules.order.customs.CustomPayload;
+import cn.lili.modules.order.customs.CustomsExchange;
+import cn.lili.modules.order.customs.model.CEB303Message;
+import cn.lili.modules.order.order.entity.dos.OrderItem;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import static cn.lili.common.enums.ResultCode.ORDER_CUSTOMS_ERROR;
+
+@Component
+public class JiangyinServiceBeanReqConverter implements CustomsReqConverter{
+
+    private final GoodsService goodsService;
+
+    @Autowired
+    public JiangyinServiceBeanReqConverter(GoodsService goodsService) {
+        this.goodsService = goodsService;
+    }
+
+    @Override
+    public String toReq(CustomsExchange exchange, CustomPayload payload) {
+        return JaxbUtils.convertToXml(converterToMsg(exchange, payload));
+    }
+
+    @Override
+    public String getSign(String content, String key) {
+        try {
+            return DigestUtil.md5Hex(content + key).toUpperCase();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        throw new ServiceException(ORDER_CUSTOMS_ERROR, "签名生成失败");
+    }
+
+    @Override
+    public boolean checkSuccess(String resStr) {
+        Map<String, Object> map = XmlUtil.xmlToMap(resStr);
+        return Optional
+                .ofNullable(map.get("success"))
+                .map(String::valueOf)
+                .filter("true"::equalsIgnoreCase)
+                .isPresent();
+    }
+
+    private CEB303Message converterToMsg(CustomsExchange exchange, CustomPayload payload){
+        exchange.setAppTime(DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_PATTERN));
+        // 批量获取商品信息
+        String ids = exchange.getOrderDetailVO().getOrderItems().stream().map(OrderItem::getGoodsId).collect(Collectors.joining(","));
+        GoodsSearchParams params = new GoodsSearchParams();
+        params.setId(ids);
+        exchange.setId2Unit(
+                goodsService.queryListByParams(params).stream().collect(Collectors.toMap(Goods::getId, Goods::getGoodsUnit))
+        );
+        return new CEB303Message(exchange, payload);
+    }
+}

framework/src/main/java/cn/lili/modules/order/customs/converter/JiangyinServiceReqConverter.java

@@ -0,0 +1,203 @@
+package cn.lili.modules.order.customs.converter;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.XmlUtil;
+import cn.hutool.crypto.digest.DigestUtil;
+import cn.lili.common.enums.JGS20Unit;
+import cn.lili.common.exception.ServiceException;
+import cn.lili.common.exception.UnitIllegalException;
+import cn.lili.modules.goods.entity.dos.Goods;
+import cn.lili.modules.goods.entity.dto.GoodsSearchParams;
+import cn.lili.modules.goods.service.GoodsService;
+import cn.lili.modules.order.customs.CustomPayload;
+import cn.lili.modules.order.customs.CustomsExchange;
+import cn.lili.modules.order.order.entity.dos.OrderItem;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static cn.lili.common.enums.ResultCode.ORDER_CUSTOMS_ERROR;
+
+@Component
+public class JiangyinServiceReqConverter implements CustomsReqConverter{
+    /** 报文前缀 */
+    private static final String CEB_PREFIX = "ceb:";
+
+    private final GoodsService goodsService;
+
+    @Autowired
+    public JiangyinServiceReqConverter(GoodsService goodsService) {
+        this.goodsService = goodsService;
+    }
+
+    @Override
+    public String toReq(CustomsExchange exchange, CustomPayload payload) {
+        // map解析
+        Map<String, Object> m = orderToMap(exchange, payload);
+        Document ceb = XmlUtil.mapToXml(m, "ceb:CEB303Message");
+        // 添加首个Node的属性
+        Element element = ceb.getDocumentElement();
+        element.setAttribute("guid", exchange.getGuid());
+        element.setAttribute("version", "1.0");
+        element.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
+        element.setAttribute("xmlns:ceb", "http://www.chinaport.gov.cn/ceb");
+        ceb.setXmlStandalone(true);
+        // 转String
+        return XmlUtil.toStr(ceb);
+    }
+
+    @Override
+    public String getSign(String content, String key) {
+        try {
+            return DigestUtil.md5Hex(content + key).toUpperCase();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        throw new ServiceException(ORDER_CUSTOMS_ERROR, "签名生成失败");
+    }
+
+    @Override
+    public boolean checkSuccess(String resStr) {
+        Map<String, Object> map = XmlUtil.xmlToMap(resStr);
+        return Optional
+                .ofNullable(map.get("success"))
+                .map(String::valueOf)
+                .filter("true"::equalsIgnoreCase)
+                .isPresent();
+    }
+
+    /**
+     * 根据订单详情生成符合报文格式的Map
+     * @param exchange 交换数据（业务）
+     * @param payload 存根（企业凭证相关）
+     * @return 符合报文格式的Map
+     */
+    private Map<String, Object> orderToMap(CustomsExchange exchange, CustomPayload payload){
+        Map<String, Object> reqMap = new LinkedHashMap<>();
+        // 1. ceb:order
+        reqMap.put(CEB_PREFIX + "Order", order(exchange, payload));
+        // 2. ceb:baseTransfer
+        reqMap.put(CEB_PREFIX + "BaseTransfer", baseTransfer(payload));
+        return reqMap;
+    }
+
+
+    /**
+     * 生成订单报文部分
+     * @param exchange 交换数据（业务）
+     * @param payload 存根（企业凭证相关）
+     * @return 报文List数据
+     */
+    private List<Map<String, Object>> order(CustomsExchange exchange, CustomPayload payload){
+        exchange.setAppTime(DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_PATTERN));
+        List<Map<String, Object>> orderList = new ArrayList<>(0);
+        Optional.ofNullable(exchange.getOrderDetailVO().getOrderItems()).ifPresent(items -> {
+            // 批量获取商品信息
+            String ids = items.stream().map(OrderItem::getGoodsId).collect(Collectors.joining(","));
+            GoodsSearchParams params = new GoodsSearchParams();
+            params.setId(ids);
+            Map<String, String> id2Unit = goodsService.queryListByParams(params).stream()
+                    .collect(Collectors.toMap(Goods::getId, Goods::getGoodsUnit));
+                for (int i = 0; i < items.size(); i++) {
+                    OrderItem item = items.get(i);
+                    try {
+                        Map<String, Object> itemMap = new HashMap<>();
+                        Map<String, Object> orderHead = new HashMap<>(32);
+                        // 1. 表头
+                        // 系统唯一序号
+                        orderHead.put(CEB_PREFIX + "guid", exchange.getGuid());
+                        // 企业报送类型 （1 - 新增， 2 - 变更， 3 - 删除）默认为1
+                        orderHead.put(CEB_PREFIX + "appType", "1");
+                        // 企业报送时间（格式YYYYMMDDhhmmss）
+                        orderHead.put(CEB_PREFIX + "appTime", exchange.getAppTime());
+                        // 业务状态 （1 - 暂存， 2 - 报送）默认为2
+                        orderHead.put(CEB_PREFIX + "appStatus", "2");
+                        // 订单类型 （I - 进口， E - 9610出口， B - 9710出口， W - 9810出口）
+                        orderHead.put(CEB_PREFIX + "orderType", "B");
+                        // 订单编号 （交易平台订单编号，长度不能超过60位）
+                        orderHead.put(CEB_PREFIX + "orderNo", exchange.getOrderDetailVO().getOrder().getSn());
+                        // 电商平台代码
+                        orderHead.put(CEB_PREFIX + "ebpCode", "无");
+                        // 电商平台名称
+                        orderHead.put(CEB_PREFIX + "ebpName", "速贸云");
+                        // 电商企业代码 （电商企业的海关注册登记编号）
+                        orderHead.put(CEB_PREFIX + "ebcCode", payload.copCode);
+                        // 电商企业名称
+                        orderHead.put(CEB_PREFIX + "ebcName", payload.copName);
+                        // 商品价格 (商品实际价格，含非现金抵扣金额)
+                        orderHead.put(CEB_PREFIX + "goodsValue", String.valueOf(item.getFlowPrice()));
+                        // 运杂费（不包含在商品价格中的运杂费，无则填写0）
+                        orderHead.put(CEB_PREFIX + "freight", "0");
+                        // 币制 （限定为人民币 - 142）
+                        orderHead.put(CEB_PREFIX + "currency", "142");
+                        // 备注
+                        orderHead.put(CEB_PREFIX + "note", "test");
+
+                        Map<String, Object> orderLists = new HashMap<>(32);
+                        // 2. 表体
+                        // 商品序号（从1开始递增序号）
+                        orderLists.put(CEB_PREFIX + "gnum", i + 1);
+                        // 企业商品货号（SKU编号，最长30位）
+                        orderLists.put(CEB_PREFIX + "itemNo", item.getSkuId());
+                        // 企业商品名称（中文名称）
+                        orderLists.put(CEB_PREFIX + "itemName", item.getGoodsName());
+                        // 企业商品描述
+                        orderLists.put(CEB_PREFIX + "itemDescribe", item.getGoodsName());
+                        // 商品条形码 （非必填）
+                        orderLists.put(CEB_PREFIX + "barCode", "");
+                        // 单位
+                        String cnName = id2Unit.get(item.getGoodsId());
+                        orderLists.put(CEB_PREFIX + "unit", JGS20Unit.ofCnName(cnName).code);
+                        // 币制 （限定为人民币 - 142）
+                        orderLists.put(CEB_PREFIX + "currency", "142");
+                        // 数量
+                        orderLists.put(CEB_PREFIX + "qty", item.getNum());
+                        // 单价
+                        orderLists.put(CEB_PREFIX + "price", item.getGoodsPrice());
+                        // 商品价格 (商品实际价格，含非现金抵扣金额)
+                        orderLists.put(CEB_PREFIX + "totalPrice", String.valueOf(item.getFlowPrice()));
+                        // 备注
+                        orderLists.put(CEB_PREFIX + "note", "test");
+
+                        // 放入订单列表
+                        itemMap.put(CEB_PREFIX + "OrderHead", orderHead);
+                        itemMap.put(CEB_PREFIX + "OrderList", orderLists);
+                        orderList.add(itemMap);
+                    } catch (UnitIllegalException e) {
+                        throw new ServiceException(ORDER_CUSTOMS_ERROR, String.format("商品[%s]", item.getGoodsName()) + e.getMsg());
+                    }
+                }
+        });
+
+        return orderList;
+    }
+
+    /**
+     * 基础报文传输Map列表
+     * @param payload 存根信息
+     * @return 基础报文传输Map列表
+     */
+    private List<Map<String, Object>> baseTransfer(CustomPayload payload){
+        List<Map<String, Object>> transfers = new ArrayList<>();
+        Map<String, Object> transfer = new HashMap<>(8);
+        // 传输企业代码
+        transfer.put(CEB_PREFIX + "copCode", payload.copCode);
+        // 传输企业名称
+        transfer.put(CEB_PREFIX + "copName", payload.copName);
+        // 报文传输模式
+        transfer.put(CEB_PREFIX + "dxpMode", "DXP");
+        // 报文传输编号
+        transfer.put(CEB_PREFIX + "dxpId", payload.dxpId);
+        // 备注
+        transfer.put(CEB_PREFIX + "note", "");
+        transfers.add(transfer);
+        return transfers;
+    }
+
+}

framework/src/main/java/cn/lili/modules/order/customs/model/BaseTransfer.java

@@ -0,0 +1,54 @@
+package cn.lili.modules.order.customs.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import static cn.lili.modules.order.customs.NameSpace.NAMESPACE_CEB_URI;
+
+@Builder
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "BaseTransfer ", namespace = NAMESPACE_CEB_URI)
+public class BaseTransfer {
+
+    /**
+     * 传输企业代码  报文传输的企业代码（需要与接入客户端的企 业身份一致）
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String copCode;
+
+    /**
+     * 传输企业名称
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String copName;
+
+    /**
+     * 报文传输模式  默认为DXP；指中国电子口岸数据交换平台
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String dxpMode;
+
+    /**
+     * 报文传输编号  向中国电子口岸数据中心申请数据交换平台 的用户编号
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String dxpId;
+
+    /**
+     * 备注
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String note;
+}
+
+

framework/src/main/java/cn/lili/modules/order/customs/model/CEB303Message.java

@@ -0,0 +1,48 @@
+package cn.lili.modules.order.customs.model;
+
+import cn.lili.modules.order.customs.CustomPayload;
+import cn.lili.modules.order.customs.CustomsExchange;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.xml.bind.annotation.*;
+
+import static cn.lili.modules.order.customs.NameSpace.NAMESPACE_CEB_URI;
+
+
+/**
+ * 海关出口订单报文
+ */
+@Data
+@NoArgsConstructor
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "CEB303Message" , namespace = NAMESPACE_CEB_URI)
+public class CEB303Message {
+
+    @XmlAttribute(name = "guid")
+    private String guid;
+
+    @XmlAttribute(name = "version")
+    private String version;
+
+    @XmlElement(name = "Order", namespace = NAMESPACE_CEB_URI)
+    private Order order;
+
+    @XmlElement(name = "BaseTransfer", namespace = NAMESPACE_CEB_URI)
+    private BaseTransfer baseTransfer;
+
+    public CEB303Message(CustomsExchange exchange, CustomPayload payload){
+        this.guid = exchange.getGuid();
+        this.order = new Order(exchange, payload);
+        this.baseTransfer = BaseTransfer.builder()
+                .copCode(payload.copCode)
+                .copName(payload.copName)
+                .dxpMode("DXP")
+                .dxpId(payload.dxpId)
+                .build();
+        this.version = "1.0";
+    }
+
+}
+

framework/src/main/java/cn/lili/modules/order/customs/model/Order.java

@@ -0,0 +1,81 @@
+package cn.lili.modules.order.customs.model;
+
+import cn.lili.common.enums.JGS20Unit;
+import cn.lili.modules.order.customs.CustomPayload;
+import cn.lili.modules.order.customs.CustomsExchange;
+import cn.lili.modules.order.order.entity.dos.OrderItem;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.math.BigDecimal;
+import java.util.LinkedList;
+import java.util.List;
+
+import static cn.lili.modules.order.customs.NameSpace.NAMESPACE_CEB_URI;
+
+/**
+ * 订单业务节点
+ */
+@Data
+@NoArgsConstructor
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "Order ", namespace = NAMESPACE_CEB_URI)
+public class Order {
+
+    @XmlElement(name = "OrderHead", namespace = NAMESPACE_CEB_URI)
+    private OrderHead orderHead;
+
+    @XmlElement(name = "OrderList", namespace = NAMESPACE_CEB_URI)
+    private List<OrderList> orderList;
+
+    public Order(CustomsExchange exchange, CustomPayload payload){
+        this.orderHead = OrderHead.builder()
+                .guid(exchange.getGuid())
+                .appType("1")
+                .appTime(exchange.getAppTime())
+                .appStatus("2")
+                .orderType("B")
+                .orderNo(exchange.getOrderDetailVO().getOrder().getSn())
+                .ebpCode("无")
+                .ebpName("速贸云")
+                .ebcCode(payload.copCode)
+                .ebcName(payload.copName)
+                .goodsValue(BigDecimal.valueOf(exchange.getOrderDetailVO().getOrder().getFlowPrice()))
+                .freight(BigDecimal.ZERO)
+                .currency("502")
+                .build();
+        this.orderList = new LinkedList<>();
+        final List<OrderItem> orderItems = exchange.getOrderDetailVO().getOrderItems();
+        String cnName;
+
+        for (int i = 0; i < orderItems.size(); i++) {
+            OrderItem item = orderItems.get(i);
+            cnName = exchange.getId2Unit().get(item.getGoodsId());
+
+            orderList.add(
+                    OrderList.builder()
+                            .gnum(i + 1)
+                            .itemNo(item.getGoodsCode())
+                            .itemName(item.getGoodsShortName())
+                            .itemDescribe("")
+                            .barCode("")
+                            .unit(JGS20Unit.ofCnName(cnName).code)
+                            .currency("502")
+                            .qty(item.getNum())
+                            .price(BigDecimal.valueOf(item.getGoodsPrice()))
+                            .totalPrice(BigDecimal.valueOf(item.getFlowPrice()))
+                            .note("")
+                            .build()
+            );
+        }
+    }
+
+}
+
+
+
+

framework/src/main/java/cn/lili/modules/order/customs/model/OrderHead.java

@@ -0,0 +1,111 @@
+package cn.lili.modules.order.customs.model;
+
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.math.BigDecimal;
+
+import static cn.lili.modules.order.customs.NameSpace.NAMESPACE_CEB_URI;
+
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "OrderHead ", namespace = NAMESPACE_CEB_URI)
+public class OrderHead {
+
+    /**
+     * 系统唯一序号 企业系统生成36位唯一序号 （英文字母大写）
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String guid;
+
+    /**
+     * 报送类型 企业报送类型。1-新增 2-变 更 3-删除。
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String appType;
+
+    /**
+     * 报送时间 格式:YYYYMMDDhhmmss。
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String appTime;
+
+    /**
+     * 报送状态  企业报送状态。1-暂存,2-申 报。填写2时,Signature节点必须 填写。
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String appStatus;
+
+    /**
+     * 订单类型
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String orderType;
+
+    /**
+     * 订单编号
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String orderNo;
+
+    /**
+     * 电商平台代码
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String ebpCode;
+
+    /**
+     * 电商平台名称
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String ebpName;
+
+    /**
+     * 电商
+     * 企业代码
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String ebcCode;
+
+    /**
+     * 电商企业名称
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String ebcName;
+
+    /**
+     * 商品金额
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private BigDecimal goodsValue;
+
+    /**
+     * 运杂费
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private BigDecimal freight;
+
+    /**
+     * 币制
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String currency;
+
+    /**
+     * 备注
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String note;
+
+}

framework/src/main/java/cn/lili/modules/order/customs/model/OrderList.java

@@ -0,0 +1,90 @@
+package cn.lili.modules.order.customs.model;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.math.BigDecimal;
+
+import static cn.lili.modules.order.customs.NameSpace.NAMESPACE_CEB_URI;
+
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "OrderList ", namespace = NAMESPACE_CEB_URI)
+public class OrderList {
+
+    /**
+     * 序号 从1开始递增
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private Integer gnum;
+
+    /**
+     * 企业商品货号
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String itemNo;
+
+    /**
+     * 企业商品名称
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String itemName;
+
+    /**
+     * 企业商品描述
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String itemDescribe;
+
+    /**
+     * 条形码 否
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String barCode;
+
+    /**
+     * 计量单位
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String unit;
+
+    /**
+     * 币制
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String currency;
+
+    /**
+     * 数量
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private Integer qty;
+
+    /**
+     * 单价
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private BigDecimal price;
+
+    /**
+     * 总价
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private BigDecimal totalPrice;
+
+    /**
+     * 备注
+     */
+    @XmlElement(namespace = NAMESPACE_CEB_URI)
+    private String note;
+}

framework/src/main/java/cn/lili/modules/order/customs/model/package-info.java

@@ -0,0 +1,14 @@
+@XmlSchema(
+        xmlns = {
+                @XmlNs(prefix = "ceb", namespaceURI = NAMESPACE_CEB_URI),
+                @XmlNs(prefix = "xsi", namespaceURI = NAMESPACE_XSI_URI)
+        }
+)
+package cn.lili.modules.order.customs.model;
+
+import javax.xml.bind.annotation.XmlNs;
+import javax.xml.bind.annotation.XmlSchema;
+
+import static cn.lili.modules.order.customs.NameSpace.NAMESPACE_CEB_URI;
+import static cn.lili.modules.order.customs.NameSpace.NAMESPACE_XSI_URI;
+

framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java

@@ -66,6 +66,18 @@ public class Order extends BaseEntity {
     private String orderStatus;
 
     /**
+     * 是否报送海关
+     */
+    @ApiModelProperty(value = "是否报送海关")
+    private Boolean customsFlag;
+
+    /**
+     * 推送海关成功时guid
+     */
+    @ApiModelProperty(value = "推送海关成功时guid")
+    private String customsGuid;
+
+    /**
      * @see PayStatusEnum
      */
     @ApiModelProperty(value = "付款状态")

framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderCustoms.java

@@ -0,0 +1,59 @@
+package cn.lili.modules.order.order.entity.dos;
+
+import cn.lili.mybatis.BaseEntity;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 海关报关记录
+ *
+ * @author Chopper
+ * @since 2020/11/17 7:30 下午
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TableName("li_order_customs")
+@ApiModel(value = "海关报关记录")
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderCustoms extends BaseEntity {
+
+    private static final long serialVersionUID = 2108971190191410183L;
+
+    @CreatedDate
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField(fill = FieldFill.INSERT)
+    @ApiModelProperty(value = "推送时间")
+    @Field(type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss || yyyy-MM-dd || yyyy/MM/dd HH:mm:ss|| yyyy/MM/dd ||epoch_millis")
+    private Date pushTime;
+
+
+    @CreatedBy
+    @TableField(fill = FieldFill.UPDATE)
+    @ApiModelProperty(value = "推送者")
+    private String pushBy;
+
+    @ApiModelProperty(value = "请求报文")
+    private String reqMsg;
+
+    @ApiModelProperty(value = "响应报文")
+    private String resMsg;
+
+}

framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import cn.lili.common.utils.BeanUtil;
 import cn.lili.common.utils.SnowFlake;
+import cn.lili.common.utils.StringUtils;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
 import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
 import cn.lili.modules.order.cart.entity.vo.CartVO;
@@ -154,4 +155,20 @@ public class OrderItem extends BaseEntity {
         this.priceDetail = JSONUtil.toJsonStr(priceDetail);
     }
 
+    /**
+     * @return 商品名称
+     */
+    public String getGoodsShortName(){
+        return goodsName.substring(0, StringUtils.findFirstIdxAlphabetNumber(goodsName));
+    }
+
+    /**
+     * @return 商品货号
+     */
+    public String getGoodsCode(){
+        int i = StringUtils.findFirstIdxAlphabetNumber(goodsName);
+        int endIdx = goodsName.indexOf(" ");
+        return goodsName.substring(i, endIdx == -1 ? goodsName.length() : endIdx);
+    }
+
 }

framework/src/main/java/cn/lili/modules/order/order/mapper/OrderCustomsMapper.java

@@ -0,0 +1,15 @@
+package cn.lili.modules.order.order.mapper;
+
+import cn.lili.modules.order.order.entity.dos.OrderCustoms;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 海关报关记录数据处理层
+ *
+ * @author Chopper
+ * @since 2020/11/17 7:34 下午
+ */
+public interface OrderCustomsMapper extends BaseMapper<OrderCustoms> {
+
+
+}

framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java

@@ -174,6 +174,13 @@ public interface OrderService extends IService<Order> {
     Traces getTraces(String orderSn);
 
     /**
+     * 订单推送海关
+     *
+     * @param orderSn 订单编号
+     */
+    boolean customsPush(String orderSn);
+
+    /**
      * 订单核验
      *
      * @param verificationCode 验证码

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java

@@ -19,6 +19,7 @@ import cn.lili.common.utils.SnowFlake;
 import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
 import cn.lili.modules.member.entity.dto.MemberAddressDTO;
 import cn.lili.modules.order.cart.entity.dto.TradeDTO;
+import cn.lili.modules.order.customs.JiangyinServiceManager;
 import cn.lili.modules.order.order.aop.OrderLogPoint;
 import cn.lili.modules.order.order.entity.dos.Order;
 import cn.lili.modules.order.order.entity.dos.OrderItem;
@@ -142,6 +143,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     @Autowired
     private TradeService tradeService;
 
+    @Autowired
+    private JiangyinServiceManager jiangyinServiceManager;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void intoDB(TradeDTO tradeDTO) {
@@ -161,6 +165,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //构建orderVO对象
             OrderVO orderVO = new OrderVO();
             BeanUtil.copyProperties(order, orderVO);
+            // 订单默认刚开始为已付款状态
+            //修改订单状态
+            order.setPaymentTime(new Date());
+            order.setPaymentMethod(PaymentMethodEnum.BANK_TRANSFER.name());
+            order.setPayStatus(PayStatusEnum.PAID.name());
+            order.setOrderStatus(OrderStatusEnum.PAID.name());
+            order.setReceivableNo("SYSTEM_AUTO_COMPLETE");
+            order.setCanReturn(!PaymentMethodEnum.BANK_TRANSFER.name().equals(order.getPaymentMethod()));
             //持久化DO
             orders.add(order);
             String message = "订单[" + item.getSn() + "]创建";
@@ -333,7 +345,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
         Order order = this.getBySn(orderSn);
         //如果订单已支付，就不能再次进行支付
-        if (order.getPayStatus().equals(PayStatusEnum.PAID.name())) {
+        if (order.getPayStatus() != null && order.getPayStatus().equals(PayStatusEnum.PAID.name())) {
             throw new ServiceException(ResultCode.PAY_DOUBLE_ERROR);
         }
 
@@ -446,6 +458,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     }
 
     @Override
+    @OrderLogPoint(description = "'订单['+#orderSn+']申请报关'", orderSn = "#orderSn")
+    @Transactional(rollbackFor = Exception.class)
+    public boolean customsPush(String orderSn) {
+        //获取订单信息
+        OrderDetailVO detailVO = this.queryDetail(orderSn);
+        // 海关平台推送
+        return jiangyinServiceManager.push(detailVO);
+    }
+
+    @Override
     @OrderLogPoint(description = "'订单['+#orderSn+']核销，核销码['+#verificationCode+']'", orderSn = "#orderSn")
     public Order take(String orderSn, String verificationCode) {
 

seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java

@@ -174,4 +174,10 @@ public class OrderStoreController {
     public ResultMessage<List<OrderExportDTO>> queryExportOrder(OrderSearchParams orderSearchParams) {
         return ResultUtil.data(orderService.queryExportOrder(orderSearchParams));
     }
+
+    @ApiOperation(value = "申请报关")
+    @PostMapping(path = "/customs/push/{orderSn}")
+    public ResultMessage<Object> customsPush(@NotBlank(message = "订单编号不能为空") @PathVariable String orderSn) {
+        return ResultUtil.data(orderService.customsPush(orderSn)? "推送成功" : "推送失败");
+    }
 }

start-api.sh

@@ -5,7 +5,16 @@ code_path=/home/source/maopengtech
 #运行目录
 run_path=/home/source/api/
 #代码分支
-branch=enversion
+branch=master
+
+mkdir -p ${code_path}
+mkdir -p ${run_path}
+cd ${code_path}
+git fetch origin 
+git checkout ${branch}
+git pull origin ${branch}
+git reset origin/${branch} --hard
+mvn clean install -DskipTests
 
 ps -ef |grep java |grep buyer  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
 ps -ef |grep java |grep seller  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
@@ -13,8 +22,17 @@ ps -ef |grep java |grep manager  |grep -v 'grep'|awk '{print $2}'  | xargs kill
 ps -ef |grep java |grep common  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
 ps -ef |grep java |grep consumer  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
 
+rm -rf ${run_path}*.jar
+mv ${code_path}/common-api/target/common-api-$version.jar ${run_path}
+mv ${code_path}/buyer-api/target/buyer-api-$version.jar ${run_path}
+mv ${code_path}/consumer/target/consumer-$version.jar ${run_path}
+mv ${code_path}/manager-api/target/manager-api-$version.jar ${run_path}
+mv ${code_path}/seller-api/target/seller-api-$version.jar ${run_path}
+
 cd ${run_path}
 
+mkdir logs
+
 nohup java -Xmx256m -Xms128m -Xss256k  -jar manager-api-$version.jar> logs/manager.out  &
 nohup java -Xmx256m -Xms128m -Xss256k  -jar common-api-$version.jar> logs/common.out  &
 nohup java -Xmx256m -Xms128m -Xss256k  -jar buyer-api-$version.jar> logs/buyer.out  &

stop-api.sh

@@ -1,15 +0,0 @@
-#版本 注意，需要跟随版本号进行调整
-version=4.2.4
-#代码目录
-code_path=/home/source/maopengtech
-#运行目录
-run_path=/home/source/api/
-#代码分支
-branch=enversion
-
-ps -ef |grep java |grep buyer  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
-ps -ef |grep java |grep seller  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
-ps -ef |grep java |grep manager  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
-ps -ef |grep java |grep common  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
-ps -ef |grep java |grep consumer  |grep -v 'grep'|awk '{print $2}'  | xargs kill -9
-