江阴综服平台订单报关接口对接

1. 海关推送记录建立，记录每次推送的请求响应信息
2. 新增推送校验
TODO： 下单时订单变更为已支付状态，预计2022-10-01之前完成

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/modules/order/customs/JiangyinServiceManager.java

@@ -1,16 +1,28 @@
 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.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.vo.OrderDetailVO;
+import cn.lili.modules.order.order.mapper.OrderCustomsMapper;
+import cn.lili.modules.order.order.mapper.OrderMapper;
+import com.dcits.app.encrypt.AESEncrypt;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 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
@@ -20,30 +32,49 @@ public class JiangyinServiceManager {
 
     private final CustomsReqConverter converter;
 
+    private final OrderMapper orderMapper;
+
+    private final OrderCustomsMapper orderCustomsMapper;
+
     @Autowired
-    public JiangyinServiceManager(CustomsReqConverter converter) {
+    public JiangyinServiceManager(CustomsReqConverter converter, OrderMapper orderMapper, OrderCustomsMapper orderCustomsMapper) {
         this.converter = converter;
+        this.orderMapper = orderMapper;
+        this.orderCustomsMapper = orderCustomsMapper;
     }
 
     public void push(OrderDetailVO detailVO){
+        Assert.isTrue(!detailVO.getOrder().getCustomsFlag(), () -> new ServiceException(ORDER_CUSTOMS_ERROR,"订单已推送海关，请勿重复推送"));
         // 企业凭证相关（后续动态获取）
         CustomPayload payload = CustomPayload.JiangyinXingguang;
+        OrderCustoms customsRec = new OrderCustoms();
         log.info("method input param: {}, payload: {}", JSONUtil.toJsonStr(detailVO), payload.toString());
-        // 报文内容
-        String content = converter.toReq(detailVO, payload);
+        // 报文内容(密文)
+        CustomsExchange exchange = new CustomsExchange(UUID.randomUUID().toString(), detailVO);
+        customsRec.setReqMsg(converter.toReq(exchange, payload));
+        String encryptContent = AESEncrypt.encrypt(customsRec.getReqMsg(), payload.signKey);
         // 构建参数
         JiangyinServiceParam param = JiangyinServiceParam.builder()
-                .signMsg(converter.getSign(content, payload.signKey))
-                .content(content)
+                .signMsg(converter.getSign(encryptContent, payload.signKey))
+                .content(encryptContent)
                 // 唯一序号
                 .copMsgId(detailVO.getOrder().getSn() + DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_PATTERN))
                 .sendCode(payload.copCode)
                 .build();
         // 开始调用
-        String bodyStr = JSONUtil.toJsonStr(param);
-        log.info("request body: {}", bodyStr);
-        String res = HttpUtil.post(JIANGYIN_ORDER_PUSH_URL, bodyStr, 30000);
+        Map<String, Object> paramMap = BeanUtil.beanToMap(param);
+        log.info("request body: {}", paramMap);
+        String res = HttpUtil.post(JIANGYIN_ORDER_PUSH_URL, paramMap, 30000);
         log.info("response msg: {}", res);
+        customsRec.setResMsg(res);
+        if (converter.checkSuccess(res)){
+            // 推送成功更新订单状态为已推送
+            Order order = exchange.getOrderDetailVO().getOrder();
+            order.setCustomsFlag(true);
+            order.setCustomsGuid(exchange.getGuid());
+            orderMapper.updateById(order);
+        }
+        orderCustomsMapper.insert(customsRec);
     }
 }
 

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

@@ -1,12 +1,15 @@
 package cn.lili.modules.order.customs.converter;
 
 import cn.lili.modules.order.customs.CustomPayload;
-import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
+import cn.lili.modules.order.customs.CustomsExchange;
 
 public interface CustomsReqConverter{
     /** 生成报文 */
-    String toReq(OrderDetailVO order, CustomPayload payload);
+    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/JiangyinServiceReqConverter.java

@@ -4,13 +4,15 @@ 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 cn.lili.modules.order.order.entity.vo.OrderDetailVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.w3c.dom.Document;
@@ -20,12 +22,12 @@ 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 static final String DS_PREFIX = "ds:";
-
 
     private final GoodsService goodsService;
 
@@ -35,22 +37,16 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
     }
 
     @Override
-    public String toReq(OrderDetailVO order, CustomPayload payload) {
-        final String guid = UUID.randomUUID().toString();
-        System.out.println(guid);;
-        CustomsExchange exchange = new CustomsExchange(guid, order);
+    public String toReq(CustomsExchange exchange, CustomPayload payload) {
         // map解析
-        Map<String, Object> m = orderToMap(order, payload);
+        Map<String, Object> m = orderToMap(exchange, payload);
         Document ceb = XmlUtil.mapToXml(m, "ceb:CEB303Message");
         // 添加首个Node的属性
         Element element = ceb.getDocumentElement();
-        element.setAttribute("guid", "311af125-6fed-4603-8c5d-49b1fa4b4b9b");
+        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");
-        //
-        Element signature = (Element)element.getLastChild();
-        signature.setAttribute("xmlns:ds", "http://www.w3.org/2000/09/xmldsig#");
         ceb.setXmlStandalone(true);
         // 转String
         return XmlUtil.toStr(ceb);
@@ -66,23 +62,28 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
         throw new RuntimeException("gen sign failed.");
     }
 
+    @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 order 订单详情
+     * @param exchange 交换数据（业务）
      * @param payload 存根（企业凭证相关）
      * @return 符合报文格式的Map
      */
-    private Map<String, Object> orderToMap(OrderDetailVO order, CustomPayload payload){
-        final String guid = UUID.randomUUID().toString();
-        System.out.println(guid);;
-        CustomsExchange exchange = new CustomsExchange(guid, order);
-
+    private Map<String, Object> orderToMap(CustomsExchange exchange, CustomPayload payload){
         Map<String, Object> reqMap = new HashMap<>();
         // 1. ceb:order
         reqMap.put(CEB_PREFIX + "Order", order(exchange, payload));
         // 2. ceb:baseTransfer
         reqMap.put(CEB_PREFIX + "BaseTransfer", baseTransfer(payload));
-
         return reqMap;
     }
 
@@ -98,76 +99,80 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
         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());
+            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);
-                Map<String, Object> itemMap = new HashMap<>();
-                Map<String, Object> orderHead = new HashMap<>(32);
-                // 1. 表头
-                // 电商平台名称
-                orderHead.put(CEB_PREFIX + "ebpName", "速贸云");
-                // 电商平台代码
-                orderHead.put(CEB_PREFIX + "ebpCode", "无");
-                // 电商企业名称
-                orderHead.put(CEB_PREFIX + "ebcName", payload.copName);
-                // 电商企业代码 （电商企业的海关注册登记编号）
-                orderHead.put(CEB_PREFIX + "ebcCode", payload.copCode);
-                // 系统唯一序号
-                orderHead.put(CEB_PREFIX + "guid", exchange.getGuid());
-                // 业务状态 （1 - 暂存， 2 - 报送）默认为2
-                orderHead.put(CEB_PREFIX + "appStatus", "2");
-                // 商品价格 (商品实际价格，含非现金抵扣金额)
-                orderHead.put(CEB_PREFIX + "goodsValue", String.valueOf(item.getFlowPrice()));
-                // 企业报送类型 （1 - 新增， 2 - 变更， 3 - 删除）默认为1
-                orderHead.put(CEB_PREFIX + "appType", "2");
-                // 运杂费（不包含在商品价格中的运杂费，无则填写0）
-                orderHead.put(CEB_PREFIX + "freight", "0");
-                // 订单类型 （I - 进口， E - 9610出口， B - 9710出口， W - 9810出口）
-                orderHead.put(CEB_PREFIX + "orderType", "B");
-                // 订单编号 （交易平台订单编号，长度不能超过60位）
-                orderHead.put(CEB_PREFIX + "orderNo", exchange.getOrderDetailVO().getOrder().getSn());
-                // 企业报送时间（格式YYYYMMDDhhmmss）
-                orderHead.put(CEB_PREFIX + "appTime", timeStr);
-                // 币制 （限定为人民币 - 142）
-                orderHead.put(CEB_PREFIX + "currency", "142");
-                // 备注
-                orderHead.put(CEB_PREFIX + "note", "");
-
-                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", "");
-                // 单位
-                // TODO 单位映射 必填
-                orderLists.put(CEB_PREFIX + "unit", id2Unit.get(item.getGoodsId()));
-                // 币制 （限定为人民币 - 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", "");
-
-                // 放入订单列表
-                itemMap.put(CEB_PREFIX + "OrderHead", orderHead);
-                itemMap.put(CEB_PREFIX + "OrderList", orderLists);
-                orderList.add(itemMap);
-            }
+                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 + "ebpName", "速贸云");
+                        // 电商平台代码
+                        orderHead.put(CEB_PREFIX + "ebpCode", "无");
+                        // 电商企业名称
+                        orderHead.put(CEB_PREFIX + "ebcName", payload.copName);
+                        // 电商企业代码 （电商企业的海关注册登记编号）
+                        orderHead.put(CEB_PREFIX + "ebcCode", payload.copCode);
+                        // 系统唯一序号
+                        orderHead.put(CEB_PREFIX + "guid", exchange.getGuid());
+                        // 业务状态 （1 - 暂存， 2 - 报送）默认为2
+                        orderHead.put(CEB_PREFIX + "appStatus", "1");
+                        // 商品价格 (商品实际价格，含非现金抵扣金额)
+                        orderHead.put(CEB_PREFIX + "goodsValue", String.valueOf(item.getFlowPrice()));
+                        // 企业报送类型 （1 - 新增， 2 - 变更， 3 - 删除）默认为1
+                        orderHead.put(CEB_PREFIX + "appType", "1");
+                        // 运杂费（不包含在商品价格中的运杂费，无则填写0）
+                        orderHead.put(CEB_PREFIX + "freight", "0");
+                        // 订单类型 （I - 进口， E - 9610出口， B - 9710出口， W - 9810出口）
+                        orderHead.put(CEB_PREFIX + "orderType", "B");
+                        // 订单编号 （交易平台订单编号，长度不能超过60位）
+                        orderHead.put(CEB_PREFIX + "orderNo", exchange.getOrderDetailVO().getOrder().getSn());
+                        // 企业报送时间（格式YYYYMMDDhhmmss）
+                        orderHead.put(CEB_PREFIX + "appTime", timeStr);
+                        // 币制 （限定为人民币 - 142）
+                        orderHead.put(CEB_PREFIX + "currency", "142");
+                        // 备注
+                        orderHead.put(CEB_PREFIX + "note", "");
+
+                        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", "");
+
+                        // 放入订单列表
+                        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;
@@ -188,7 +193,6 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
         // 报文传输模式
         transfer.put(CEB_PREFIX + "dxpMode", "DXP");
         // 报文传输编号
-        // TODO 待平台方确认
         transfer.put(CEB_PREFIX + "dxpId", payload.dxpId);
         // 备注
         transfer.put(CEB_PREFIX + "note", "");

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/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/serviceimpl/OrderServiceImpl.java

@@ -451,6 +451,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     @Override
     @OrderLogPoint(description = "'订单['+#orderSn+']申请报关'", orderSn = "#orderSn")
+    @Transactional(rollbackFor = Exception.class)
     public void customsPush(String orderSn) {
         //获取订单信息
         OrderDetailVO detailVO = this.queryDetail(orderSn);