第三方接口合一

src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfItemShippedEntity.java

@@ -38,6 +38,8 @@ public class TbCfItemShippedEntity implements Serializable {
      */
     private String country;
 
+    private String deliveryName;
+
     private String deliveryPhone;
     /**
      * 收货地址
@@ -56,9 +58,7 @@ public class TbCfItemShippedEntity implements Serializable {
     /**
      * 商品品名
      */
-    private String descripitionId;
-
-    private String descripitionName;
+    private String descripition;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -72,13 +72,6 @@ public class TbCfItemShippedEntity implements Serializable {
         this.itemId = itemId;
     }
 
-    public String getDescripitionId() {
-        return descripitionId;
-    }
-
-    public void setDescripitionId(String descripitionId) {
-        this.descripitionId = descripitionId;
-    }
 
     /**
      * 设置：订单id
@@ -174,11 +167,20 @@ public class TbCfItemShippedEntity implements Serializable {
         this.itemSku = itemSku;
     }
 
-    public String getDescripitionName() {
-        return descripitionName;
+
+    public String getDeliveryName() {
+        return deliveryName;
+    }
+
+    public void setDeliveryName(String deliveryName) {
+        this.deliveryName = deliveryName;
+    }
+
+    public String getDescripition() {
+        return descripition;
     }
 
-    public void setDescripitionName(String descripitionName) {
-        this.descripitionName = descripitionName;
+    public void setDescripition(String descripition) {
+        this.descripition = descripition;
     }
 }

src/main/resources/mapper/TbCfOrderDao.xml

@@ -356,15 +356,14 @@
 		CONCAT_WS("_",u.nick,u.user_no) userInfo,
 		p.create_time deliveryTime,
 		a.address_country_name countryName,
-		o.delivery_name delivery,
+		o.delivery_name deliveryName,
 		o.delivery_phone deliveryPhone,
 		o.delivery_address deliveryAddress,
 		i.item_id itemId,
 		i.item_title itemTitle,
 		i.item_num itemNum,
 		i.item_sku itemSku,
-		p.descripition_id descripitionId,
-		e.template_title descripitionName
+		CONCAT_WS("_",p.descripition_id,e.template_title) descripition
 		from tb_cf_order o
 		INNER JOIN  tb_cf_item_order_r r on r.order_id=o.order_id
 		INNER JOIN   tb_cf_platform_order p on r.order_item_id=p.relative_id