修改第三方接口：根据订单号查询订单

src/main/java/com/diaoyun/zion/chinafrica/dao/TbCfOrderDao.java

 package com.diaoyun.zion.chinafrica.dao;
 
-import com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity;
-import com.diaoyun.zion.chinafrica.entity.TbCfItemShippedEntity;
-import com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity;
+import com.diaoyun.zion.chinafrica.entity.*;
 import com.diaoyun.zion.master.dao.BaseDao;
 
 import java.util.Date;
@@ -31,6 +29,7 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
      */
     List<TbCfItemDetailEntity> getOrderItemList(String orderId);
 
+    List<ItemEntity> getItemList(String orderId);
     /**
      * 获取付款订单
      * @param beginDate
@@ -46,4 +45,6 @@ public interface TbCfOrderDao extends BaseDao<TbCfOrderEntity> {
      * @return
      */
     List<TbCfItemShippedEntity> getDeliveryList(Date beginDate, Date endDate);
+
+    OrderEntity getOrder(String orderId);
 }

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

+package com.diaoyun.zion.chinafrica.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 商品明细（用于订单查询）
+ */
+public class ItemEntity implements Serializable {
+    /**
+     * 商品表记录id
+     */
+    private String itemId;
+
+    /**
+     * 商品名称
+     */
+    private String itemTitle;
+    /**
+     * 商品数量
+     */
+    private Integer itemNum;
+    /**
+     * 商品价格
+     */
+    private BigDecimal itemPrice;
+    /**
+     * 商品分类
+     */
+    private String itemCategory;
+    /**
+     * 商品品名
+     */
+    private String descripitionName;
+
+    public String getItemId() {
+        return itemId;
+    }
+
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+
+    public String getItemTitle() {
+        return itemTitle;
+    }
+
+    public void setItemTitle(String itemTitle) {
+        this.itemTitle = itemTitle;
+    }
+
+    public Integer getItemNum() {
+        return itemNum;
+    }
+
+    public void setItemNum(Integer itemNum) {
+        this.itemNum = itemNum;
+    }
+
+    public BigDecimal getItemPrice() {
+        return itemPrice;
+    }
+
+    public void setItemPrice(BigDecimal itemPrice) {
+        this.itemPrice = itemPrice;
+    }
+
+    public String getItemCategory() {
+        return itemCategory;
+    }
+
+    public void setItemCategory(String itemCategory) {
+        this.itemCategory = itemCategory;
+    }
+
+    public String getDescripitionName() {
+        return descripitionName;
+    }
+
+    public void setDescripitionName(String descripitionName) {
+        this.descripitionName = descripitionName;
+    }
+}

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

+package com.diaoyun.zion.chinafrica.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 订单 （用于订单查询）
+ */
+public class OrderEntity implements Serializable {
+
+    /**
+     * 订单id
+     */
+    private String orderId;
+    /**
+     * 订单号
+     */
+    private Long orderNo;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 收货地址
+     */
+    private String deliveryAddress;
+    /**
+     * 收货人
+     */
+    private String deliveryName;
+    /**
+     * 收货人手机
+     */
+    private String deliveryPhone;
+    /**
+     * 商品明细集合
+     */
+    private List<ItemEntity> itemDetailList;
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public Long getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Long orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getDeliveryAddress() {
+        return deliveryAddress;
+    }
+
+    public void setDeliveryAddress(String deliveryAddress) {
+        this.deliveryAddress = deliveryAddress;
+    }
+
+    public String getDeliveryName() {
+        return deliveryName;
+    }
+
+    public void setDeliveryName(String deliveryName) {
+        this.deliveryName = deliveryName;
+    }
+
+    public String getDeliveryPhone() {
+        return deliveryPhone;
+    }
+
+    public void setDeliveryPhone(String deliveryPhone) {
+        this.deliveryPhone = deliveryPhone;
+    }
+
+    public List<ItemEntity> getItemDetailList() {
+        return itemDetailList;
+    }
+
+    public void setItemDetailList(List<ItemEntity> itemDetailList) {
+        this.itemDetailList = itemDetailList;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+}

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

@@ -71,6 +71,16 @@ public class TbCfItemDetailEntity implements Serializable {
      */
     private Date createTime;
 
+    private String descripitionName;
+
+    public String getDescripitionName() {
+        return descripitionName;
+    }
+
+    public void setDescripitionName(String descripitionName) {
+        this.descripitionName = descripitionName;
+    }
+
     /**
      * 设置：商品id
      */

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

@@ -127,6 +127,19 @@ public class TbCfOrderEntity implements Serializable {
      */
     private Integer enableFlag;
 
+
+    /**
+     * 商品品名
+     */
+    private String descripitionName;
+
+    public String getDescripitionName() {
+        return descripitionName;
+    }
+
+    public void setDescripitionName(String descripitionName) {
+        this.descripitionName = descripitionName;
+    }
     /**
      * 设置：订单id
      */
@@ -257,6 +270,8 @@ public class TbCfOrderEntity implements Serializable {
     public String getUserName() {
         return userName;
     }
+
+
     /**
      * 设置：收货地址Id
      */

src/main/java/com/diaoyun/zion/chinafrica/service/impl/TbCfOrderServiceImpl.java

@@ -345,28 +345,31 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
 
     @Override
     public Result getOrderDetailThird(String orderId) {
-        Result<TbCfOrderVo> result = new Result<>();
-        TbCfOrderEntity tbCfOrderEntity = tbCfOrderDao.queryObject(orderId);
-        TbCfOrderVo tbCfOrderVo = new TbCfOrderVo();
-        tbCfOrderVo.setOrderId(tbCfOrderEntity.getOrderId());
-        tbCfOrderVo.setDeliveryPhone(tbCfOrderEntity.getDeliveryPhone());
-        tbCfOrderVo.setDeliveryName(tbCfOrderEntity.getDeliveryName());
-        tbCfOrderVo.setDeliveryAddress(tbCfOrderEntity.getDeliveryAddress());
-
+        Result<OrderEntity> result = new Result<>();
+        OrderEntity order = tbCfOrderDao.getOrder(orderId);
+        OrderEntity orderEntity=new OrderEntity();
+        orderEntity.setOrderId(order.getOrderId());
+        orderEntity.setDeliveryPhone(order.getDeliveryPhone());
+        orderEntity.setDeliveryName(order.getDeliveryName());
+        orderEntity.setDeliveryAddress(order.getDeliveryAddress());
+        orderEntity.setOrderNo(order.getOrderNo());
+        orderEntity.setUserName(order.getUserName());
         //获取订单内商品
-        List<TbCfItemDetailEntity> tbCfItemDetailList = tbCfOrderDao.getOrderItemList(orderId);
+        List<ItemEntity> items = tbCfOrderDao.getItemList(orderId);
         //返回的订单商品详情
-        List<TbCfCartItemDetailVo> itemDetailVoList = new ArrayList<>();
-        for (TbCfItemDetailEntity tbCfItemDetail : tbCfItemDetailList) {
-            TbCfCartItemDetailVo tbCfCartItemDetailVo = new TbCfCartItemDetailVo();
-            tbCfCartItemDetailVo.setItemNum(tbCfItemDetail.getItemNum());
-            tbCfCartItemDetailVo.setItemCategory(tbCfItemDetail.getItemCategory());
-            tbCfCartItemDetailVo.setItemPrice(tbCfItemDetail.getItemPrice());
-            tbCfCartItemDetailVo.setItemTitle(tbCfItemDetail.getItemTitle());
-            itemDetailVoList.add(tbCfCartItemDetailVo);
+        List<ItemEntity> itemList = new ArrayList<>();
+        for (ItemEntity item : items) {
+            ItemEntity entity=new ItemEntity();
+            entity.setItemNum(item.getItemNum());
+            entity.setItemCategory(item.getItemCategory());
+            entity.setItemPrice(item.getItemPrice());
+            entity.setItemTitle(item.getItemTitle());
+            entity.setItemId(item.getItemId());
+            entity.setDescripitionName(item.getDescripitionName());
+            itemList.add(entity);
         }
-        tbCfOrderVo.setItemDetailList(itemDetailVoList);
-        result.setData(tbCfOrderVo);
+        orderEntity.setItemDetailList(itemList);
+        result.setData(orderEntity);
         return result;
     }
 

src/main/java/com/diaoyun/zion/chinafrica/vo/TbCfCartItemDetailVo.java

@@ -99,6 +99,16 @@ public class TbCfCartItemDetailVo implements Serializable {
     @ApiModelProperty("创建时间")
     private Date createTime;
 
+    @ApiModelProperty("商品品名")
+    private String descripitionName;
+
+    public String getDescripitionName() {
+        return descripitionName;
+    }
+
+    public void setDescripitionName(String descripitionName) {
+        this.descripitionName = descripitionName;
+    }
     /**
      * 设置：商品id
      */

src/main/resources/application.yml

@@ -44,7 +44,7 @@ spring:
         url: jdbc:mysql://47.106.242.175:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
         username: root
         password: diaoyun666
-        
+
       # 连接池配置
       initial-size: 5
       min-idle: 5
@@ -67,8 +67,8 @@ spring:
       filters: stat,wall
       # Spring监控AOP切入点，如x.y.z.service.*,配置多个英文逗号分隔
       aop-patterns: com.springboot.servie.*
-      
-    
+
+
       # WebStatFilter配置
       web-stat-filter:
         enabled: true
@@ -76,8 +76,8 @@ spring:
         url-pattern: /*
         # 忽略过滤的格式
         exclusions: '*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*'
-      
-      # StatViewServlet配置 
+
+      # StatViewServlet配置
       stat-view-servlet:
         enabled: true
         # 访问路径为/druid时，跳转到StatViewServlet

src/main/resources/mapper/TbCfOrderDao.xml

@@ -32,6 +32,7 @@
         <result property="payId" column="pay_id"/>
         <result property="payStatus" column="pay_status"/>
         <result property="enableFlag" column="enable_flag"/>
+		<result property="descripitionName" column="descripition_name"></result>
     </resultMap>
 
 	<select id="queryObject" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
@@ -63,11 +64,22 @@
 			`tax`,
 			`pay_id`,
 			`pay_status`,
-			`enable_flag`
+			`enable_flag`,
+			`descripition_name`
 		from tb_cf_order
 		where order_id = #{id}
 	</select>
-
+	<select id="getOrder" resultType="com.diaoyun.zion.chinafrica.entity.OrderEntity">
+			select
+				`order_id`,
+				`order_no`,
+				`user_name`,
+				`delivery_address`,
+				`delivery_name`,
+				`delivery_phone`
+			from tb_cf_order
+			where order_id = #{id}
+	</select>
 	<select id="queryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
 		select
     		`order_id`,
@@ -97,7 +109,8 @@
     		`tax`,
     		`pay_id`,
     		`pay_status`,
-    		`enable_flag`
+    		`enable_flag`,
+		`descripition_name`
 		from tb_cf_order
 		WHERE 1=1
 		<if test="name != null and name.trim() != ''">
@@ -153,7 +166,8 @@
 			`tax`,
 			`pay_id`,
 			`pay_status`,
-			`enable_flag`)
+			`enable_flag`,
+			`descripition_name`)
 		values(
 			#{orderId},
 			#{orderNo},
@@ -182,7 +196,8 @@
 			#{tax},
 			#{payId},
 			#{payStatus},
-			#{enableFlag})
+			#{enableFlag},
+			#{descripitionName})
 	</insert>
 	 
 	<update id="update" parameterType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
@@ -214,7 +229,8 @@
 			<if test="tax != null">`tax` = #{tax}, </if>
 			<if test="payId != null">`pay_id` = #{payId}, </if>
 			<if test="payStatus != null">`pay_status` = #{payStatus},</if>
-			<if test="enableFlag != null">`enable_flag` = #{enableFlag}</if>
+			<if test="enableFlag != null">`enable_flag` = #{enableFlag},</if>
+			<if test="descripitionName != null">`descripition_name` = #{descripitionName}</if>
 		</set>
 		where order_id = #{orderId}
 	</update>
@@ -239,10 +255,32 @@
 
     <!--根据订单id，获取订单内商品详情-->
     <select id="getOrderItemList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemDetailEntity">
-        select t2.* from tb_cf_item_order_r t1,tb_cf_item_detail t2 where t1.order_id=#{orderId}
-        and t1.enable_flag=1 and t2.item_id=t1.item_id
+		SELECT
+		t1.*,
+		t3.descripition_name descripitionName
+		FROM
+		tb_cf_item_detail t1
+		LEFT JOIN tb_cf_item_order_r t2 ON t1.item_id = t2.item_id
+		LEFT JOIN tb_cf_order t3 ON t2.order_id = t3.order_id
+		WHERE
+		t2.enable_flag = 1 and t3.order_id=#{order_id}
+    </select>
+	<!--根据订单id，获取订单内商品详情-->
+	<select id="getItemList" resultType="com.diaoyun.zion.chinafrica.entity.ItemEntity">
+		SELECT
+		t1.item_id,
+		t1.item_title,
+		t1.item_num,
+		t1.item_price,
+		t1.item_category,
+		t3.descripition_name descripitionName
+		FROM
+		tb_cf_item_detail t1
+		LEFT JOIN tb_cf_item_order_r t2 ON t1.item_id = t2.item_id
+		LEFT JOIN tb_cf_order t3 ON t2.order_id = t3.order_id
+		WHERE
+		t2.enable_flag = 1 and t3.order_id=#{order_id}
     </select>
-
 	<!--获取付款订单-->
 	<select id="getOrderListByTime" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
 		select user_id,order_id,deal_time from tb_cf_order where pay_status=20 and enable_flag=1 and