重构版

platform-admin/src/main/java/com/platform/entity/ActivityEntity.java

@@ -296,11 +296,4 @@ public class ActivityEntity implements Serializable {
         this.itemList = itemList;
     }
 
-    public Double getDiscountRate() {
-        return discountRate;
-    }
-
-    public void setDiscountRate(Double discountRate) {
-        this.discountRate = discountRate;
-    }
 }

platform-admin/src/main/resources/com/platform/dao/TbCfOrderListDao.xml

@@ -121,30 +121,30 @@
 
     <!--查询代购订单列表-->
     <select id="queryOrderDeliveryList" resultType="com.platform.vo.DeliveryOrderVo">
-	select
-		r.order_item_id ordersId,
-		o.order_id,
-		i.item_id,
-		o.order_no,
-		i.item_img,
-		i.item_title,
-		g.item_url,
-		r.item_num,
-		g.discount_price itemPrice,
-		i.item_sku,
-		i.source_item_id,
-		r.delivery_flag,
-		p.p_express_number,
-		o.delivery_name,
-		o.delivery_phone,
-		o.delivery_address
-	from tb_cf_item_order_r r
-	LEFT JOIN tb_cf_order o on o.order_id=r.order_id
-	LEFT JOIN tb_cf_item_detail i  on i.item_id = r.item_id
-	LEFT JOIN tb_cf_station_item g on i.goods_id=g.item_id
-	LEFT JOIN tb_cf_platform_order p on  p.relative_id =r.order_item_id
-	LEFT JOIN tb_cf_coupon c on c.coupon_id =o.coupon_id
-	where r.order_id=#{orderId}
+        SELECT
+        r.order_item_id ordersId,
+        o.order_id,
+        i.item_id,
+        o.order_no,
+        r.item_img,
+        i.item_name itemTitle,
+        i.item_url,
+        r.item_num,
+        i.discount_price itemPrice,
+        r.item_sku,
+        r.delivery_flag,
+        p.p_express_number,
+        o.delivery_name,
+        o.delivery_phone,
+        o.delivery_address
+        FROM
+        tb_cf_item_order_r r
+        LEFT JOIN tb_cf_order o ON o.order_id = r.order_id
+        LEFT JOIN tb_cf_station_item i ON r.item_id = i.item_id
+        LEFT JOIN tb_cf_platform_order p ON p.relative_id = r.order_item_id
+        LEFT JOIN tb_cf_coupon c ON c.coupon_id = o.coupon_id
+        WHERE
+        r.order_id = #{orderId}
 	</select>
 
     <select id="queryOrderDeliveryWebList" resultType="com.platform.vo.DeliveryOrderVo">