报文模型方式生成报文

- Map方式生成的报文无法保证字段顺序，针对报文建立模型
- 对比历史成功订单，货币应为美元(502)
- 对比历史成功订单，商品名称为原商品名称货号之前部分字符串

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 findFirstIndexNumberOfStr(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/modules/order/customs/CustomsExchange.java

@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.Map;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -12,4 +14,8 @@ 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

@@ -17,6 +17,7 @@ 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.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -38,7 +39,9 @@ public class JiangyinServiceManager {
     private final OrderCustomsMapper orderCustomsMapper;
 
     @Autowired
-    public JiangyinServiceManager(CustomsReqConverter converter, OrderMapper orderMapper, OrderCustomsMapper orderCustomsMapper) {
+    public JiangyinServiceManager(@Qualifier("jiangyinServiceBeanReqConverter") CustomsReqConverter converter,
+                                  OrderMapper orderMapper,
+                                  OrderCustomsMapper orderCustomsMapper) {
         this.converter = converter;
         this.orderMapper = orderMapper;
         this.orderCustomsMapper = orderCustomsMapper;
@@ -53,8 +56,9 @@ public class JiangyinServiceManager {
         OrderCustoms customsRec = new OrderCustoms();
         log.info("method input param: {}, payload: {}", JSONUtil.toJsonStr(detailVO), payload.toString());
         // 报文内容(密文)
-        CustomsExchange exchange = new CustomsExchange(UUID.randomUUID().toString(), detailVO);
+        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);
         // 构建参数
@@ -68,6 +72,7 @@ public class JiangyinServiceManager {
         // 开始调用
         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);

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/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

@@ -79,7 +79,7 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
      * @return 符合报文格式的Map
      */
     private Map<String, Object> orderToMap(CustomsExchange exchange, CustomPayload payload){
-        Map<String, Object> reqMap = new HashMap<>();
+        Map<String, Object> reqMap = new LinkedHashMap<>();
         // 1. ceb:order
         reqMap.put(CEB_PREFIX + "Order", order(exchange, payload));
         // 2. ceb:baseTransfer
@@ -95,7 +95,7 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
      * @return 报文List数据
      */
     private List<Map<String, Object>> order(CustomsExchange exchange, CustomPayload payload){
-        final String timeStr = DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_PATTERN);
+        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 -> {
             // 批量获取商品信息
@@ -110,34 +110,34 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
                         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");
+                        // 企业报送时间（格式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());
-                        // 企业报送时间（格式YYYYMMDDhhmmss）
-                        orderHead.put(CEB_PREFIX + "appTime", timeStr);
+                        // 电商平台代码
+                        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", "");
+                        orderHead.put(CEB_PREFIX + "note", "test");
 
                         Map<String, Object> orderLists = new HashMap<>(32);
                         // 2. 表体
@@ -163,7 +163,7 @@ public class JiangyinServiceReqConverter implements CustomsReqConverter{
                         // 商品价格 (商品实际价格，含非现金抵扣金额)
                         orderLists.put(CEB_PREFIX + "totalPrice", String.valueOf(item.getFlowPrice()));
                         // 备注
-                        orderLists.put(CEB_PREFIX + "note", "");
+                        orderLists.put(CEB_PREFIX + "note", "test");
 
                         // 放入订单列表
                         itemMap.put(CEB_PREFIX + "OrderHead", orderHead);

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/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.findFirstIndexNumberOfStr(goodsName));
+    }
+
+    /**
+     * @return 商品货号
+     */
+    public String getGoodsCode(){
+        int i = StringUtils.findFirstIndexNumberOfStr(goodsName);
+        int endIdx = goodsName.indexOf(" ");
+        return goodsName.substring(i, endIdx == -1 ? goodsName.length() : endIdx);
+    }
+
 }