提交

platform-admin/src/main/java/com/platform/controller/TbCfOrderController.java

 package com.platform.controller;
 
+import com.platform.dao.ActivityDao;
 import com.platform.entity.*;
 import com.platform.service.TbCfItemOrderRService;
 import com.platform.service.TbCfOrderListService;
@@ -35,6 +36,9 @@ public class TbCfOrderController extends AbstractController {
     @Autowired
     private TbCfItemOrderRService tbCfItemOrderRService;
 
+    @Autowired
+    private ActivityDao activityDao;
+
     /**
      * 查看列表
      */
@@ -245,11 +249,18 @@ public class TbCfOrderController extends AbstractController {
         //查询列表数据
         OrderBasicVo orderBasicVo = tbCfOrderListService.queryorderBasic(orderId);
         List<TbCfItemOrderREntity> orderDetails = tbCfOrderService.queryByOrderId(orderId);
+        String activityId = orderBasicVo.getActivityId();
+        ActivityEntity activity = activityDao.queryObject(activityId);
+
+
         Integer num = 0;
         for (TbCfItemOrderREntity orderDetail : orderDetails) {
             num += orderDetail.getItemNum();
         }
         orderBasicVo.setNum(num);
+        if (activity != null) {
+            orderBasicVo.setActivity(activity.getContent());
+        }
         orderBasicVo.setAtcTime("35天（day）");
 //        orderBasicVo.setCountry("赞比亚（Zambia）");
         if (orderBasicVo.getOrderSource() != null)

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

@@ -148,6 +148,8 @@ public class TbCfOrderEntity implements Serializable {
 
     private String tested;
 
+    private String activityId;
+
     public Integer getOrderSource() {
         return orderSource;
     }
@@ -573,4 +575,12 @@ public class TbCfOrderEntity implements Serializable {
     public void setTested(String tested) {
         this.tested = tested;
     }
+
+    public String getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(String activityId) {
+        this.activityId = activityId;
+    }
 }

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

@@ -37,6 +37,9 @@ public class OrderBasicVo implements Serializable {
 
     private BigDecimal reduceAmount;
 
+    private String activityId;
+    private String activity;
+
     private Integer num;
 
     public BigDecimal getCouponPrice() {
@@ -272,4 +275,20 @@ public class OrderBasicVo implements Serializable {
     public void setNum(Integer num) {
         this.num = num;
     }
+
+    public String getActivity() {
+        return activity;
+    }
+
+    public void setActivity(String activity) {
+        this.activity = activity;
+    }
+
+    public String getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(String activityId) {
+        this.activityId = activityId;
+    }
 }

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

@@ -925,7 +925,7 @@ let vm = new Vue({
                     // vm.basicInfoData[4].data = r.orderBasicVo.country;
                     vm.basicInfoData[4].data = r.orderBasicVo.payId;
                     vm.basicInfoData[5].data = r.orderBasicVo.payWayCode;
-                    // vm.basicInfoData[7].data = r.orderBasicVo.couponTitle;
+                    vm.basicInfoData[6].data = r.orderBasicVo.activity;
                     vm.recipientsData[0].recipients = r.orderBasicVo.deliveryName;
                     vm.recipientsData[0].phone = r.orderBasicVo.deliveryPhone
                     vm.recipientsData[0].email = r.orderBasicVo.email;