Merge branch 'lcy' of http://47.107.53.207:3000/traineeCoder001/Digital-Investment

ruoyi-demo/src/main/java/com/ruoyi/demo/controller/PlanController.java

@@ -51,8 +51,7 @@ public class PlanController {
     // 查询广告计划明细
     @GetMapping("/{planId}")
     public R planDetail(@PathVariable String planId){
-        PlanDetailVo vo = planService.getPlanDetail(planId);
-        return R.ok(vo);
+        return R.ok(planService.getPlanDetail(planId));
     }
     // 投放广告计划
     @GetMapping("/push/{equipmentCode}")

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanDetailVo.java

@@ -8,28 +8,24 @@ import java.util.List;
 // 广告计划明细
 @Data
 public class PlanDetailVo {
-//    private String goodsName;
-//    private String goodsImg;
+    private String planId;
+    private String planName;
+    private String goodsName;
     private String goodsLogo;
-//    private String goodsIntroduce;
-//    private String goodsClassify;
-    private String appkey;
     private String appName;
-    private String commercialId;
-    private String commercialName;
+    private String principalName;
+    private String principalTelephone;
     private List<PlanItemVo> planItems;
 
     public PlanDetailVo(){}
     public PlanDetailVo(Plan plan, List<PlanItemVo> itemVos){
-//        this.goodsName = plan.getGoodsName();
-//        this.goodsImg = plan.getGoodsImg();
+        this.planId = plan.getPlanId();
+        this.planName = plan.getPlanName();
+        this.goodsName = plan.getGoodsName();
         this.goodsLogo = plan.getGoodsLogo();
-//        this.goodsIntroduce = plan.getGoodsIntroduce();
-//        this.goodsClassify = plan.getGoodsClassify();
-        this.appkey = plan.getAppkey();
         this.appName = plan.getAppName();
-        this.commercialId = plan.getCommercialId();
-        this.commercialName = plan.getCommercialName();
+        this.principalName = plan.getPrincipalName();
+        this.principalTelephone = plan.getPrincipalTelephone();
         this.planItems = itemVos;
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/entity/vo/PlanManageDetailVo.java

@@ -1,22 +1,42 @@
 package com.ruoyi.demo.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.ruoyi.demo.entity.Plan;
+import com.ruoyi.demo.utils.StateUtil;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Data
 public class PlanManageDetailVo {
+    private String planId;
+    private String appName;
+    private String goodsName;
+    private String goodsImg;
     private String goodsLogo;
-    private String goodsIntroduce;
-    private String goodsClassify;
+    private String commercialName;
+    private String state;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonSerialize(using = LocalDateTimeSerializer.class)
+    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+    private LocalDateTime planCreateTime;
     private List<PlanManageItemVo> planItems;
 
     public PlanManageDetailVo(){}
     public PlanManageDetailVo(Plan plan, List<PlanManageItemVo> itemVos){
+        this.planId = plan.getPlanId();
+        this.appName = plan.getAppName();
+        this.goodsName = plan.getGoodsName();
+        this.goodsImg = plan.getGoodsImg();
         this.goodsLogo = plan.getGoodsLogo();
-        this.goodsIntroduce = plan.getGoodsIntroduce();
-        this.goodsClassify = plan.getGoodsClassify();
+        this.commercialName = plan.getCommercialName();
+        this.state = StateUtil.getStateName(plan.getState());
+        this.planCreateTime = plan.getPlanCreateTime();
         this.planItems = itemVos;
     }
 }

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/PlanServiceImpl.java

@@ -323,8 +323,11 @@ public class PlanServiceImpl implements PlanService {
         List<PlanManageItemVo> itemVos = new ArrayList<>();
         for (PlanItem item : items){
             PlanManageItemVo itemVo = new PlanManageItemVo(item);
-            Store store = storeMapper.selectById(item.getStoreId());
-            itemVo.setStoreName(store.getStoreName());
+            if (item.getStoreId() != null){
+                Store store = storeMapper.selectById(item.getStoreId());
+                if (store != null)
+                    itemVo.setStoreName(store.getStoreName());
+            }
             itemVos.add(itemVo);
         }
         PlanManageDetailVo vo = new PlanManageDetailVo(plan, itemVos);