修改订单商品链接bug

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

@@ -30,6 +30,15 @@ public class TbCfOrderListEntity implements Serializable {
     private String couponTitle;
     private String deliveryFlag;
     private BigDecimal itemsPrice;
+    private String itemUrl;
+
+    public String getItemUrl() {
+        return itemUrl;
+    }
+
+    public void setItemUrl(String itemUrl) {
+        this.itemUrl = itemUrl;
+    }
 
     private Integer orderSource;
 

platform-admin/src/main/java/com/platform/vo/DeliveryOrderVo.java

@@ -22,6 +22,15 @@ public class DeliveryOrderVo implements Serializable {
     private String deliveryName;
     private String deliveryPhone;
     private String deliveryAddress;
+    private String itemUrl;
+
+    public String getItemUrl() {
+        return itemUrl;
+    }
+
+    public void setItemUrl(String itemUrl) {
+        this.itemUrl = itemUrl;
+    }
 
     public String getDeliveryName() {
         return deliveryName;
@@ -143,4 +152,4 @@ public class DeliveryOrderVo implements Serializable {
     public void setItemSku(String itemSku) {
         this.itemSku = itemSku;
     }
-}
\ No newline at end of file
+}

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

@@ -22,6 +22,7 @@
         <result property="couponId" column="coupon_id"/>
         <result property="couponTitle" column="coupon_title"/>
         <result property="deliveryFlag" column="delivery_flag"/>
+        <result property="itemUrl" column="item_url"/>
     </resultMap>
     <!--查询订单列表-->
     <select id="queryOrderList" resultType="com.platform.entity.TbCfOrderListEntity">
@@ -127,6 +128,7 @@
 		o.order_no,
 		i.item_img,
 		i.item_title,
+		g.item_url,
 		r.item_num,
 		g.discount_price itemPrice,
 		i.item_sku,
@@ -146,7 +148,7 @@
 	</select>
 
     <select id="queryOrderDeliveryWebList" resultType="com.platform.vo.DeliveryOrderVo">
-        select *,s.discount_price itemPrice,s.item_name itemTitle,i.sku_desc itemSku,i.sku_img itemImg, r.item_num itemNum from  tb_cf_item_order_r r
+        select *,s.discount_price itemPrice,s.item_name itemTitle,i.sku_desc itemSku,i.sku_img itemImg, r.item_num itemNum,r.item_url 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_skus i on r.item_id=i.id
         left join tb_cf_station_item s on s.item_id=i.item_id

platform-admin/src/main/webapp/WEB-INF/page/sys/tbcforderlist.html

@@ -269,7 +269,7 @@
                 <td>$ {{item.itemPrice}}</td>
                 <td>{{item.itemNum}}</td>
                 <td>
-                    <span style="color:blue;cursor: pointer;" @click="toProductLink(item.sourceItemId)">商品链接</span>
+                    <span style="color:blue;cursor: pointer;" @click="toProductLink(item.itemUrl)">商品链接</span>
                 </td>
                 <td>{{item.deliveryFlag}}</td>
                 <td>{{item.pExpressNumber}}</td>
@@ -400,4 +400,4 @@
 <script>
 
 </script>
-</html>
\ No newline at end of file
+</html>

platform-admin/src/main/webapp/js/sys/tbcforderList.js

@@ -380,13 +380,13 @@ let vm = new Vue({
                 data: 18
             },*/ {
                 type: '交易流水号',
-                data: 18
+                data: ''
             }, {
                 type: '支付方式',
-                data: 18
+                data: ''
             }, {
                 type: '活动信息',
-                data: 18
+                data: ''
             }
         ],
         recipientsColumns: [
@@ -853,8 +853,8 @@ let vm = new Vue({
                     vm.basicInfoData[2].data = r.orderBasicVo.atcTime;
                     vm.basicInfoData[3].data = source;
                     // vm.basicInfoData[4].data = r.orderBasicVo.country;
-                    vm.basicInfoData[5].data = r.orderBasicVo.payId;
-                    vm.basicInfoData[6].data = r.orderBasicVo.payWayCode;
+                    vm.basicInfoData[4].data = r.orderBasicVo.payId;
+                    vm.basicInfoData[5].data = r.orderBasicVo.payWayCode;
                     // vm.basicInfoData[7].data = r.orderBasicVo.couponTitle;
                     vm.recipientsData[0].recipients = r.orderBasicVo.deliveryName;
                     vm.recipientsData[0].phone = r.orderBasicVo.deliveryPhone