首页数据

src/main/java/com/caimei/modules/order/entity/LogisticsBatch.java

@@ -1,6 +1,9 @@
 package com.caimei.modules.order.entity;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 
 /**
@@ -16,6 +19,8 @@ public class LogisticsBatch {
     private String mailer;//邮寄者  0 采美   1 供应商
     private Integer shopID;//供应商ID
     private Date updateDate;//最后更新时间
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date deliveryTime;//发货时间
     private Date receiptTime;//收货时间
 

src/main/java/com/caimei/modules/order/entity/LogisticsInformation.java

@@ -1,9 +1,6 @@
 package com.caimei.modules.order.entity;
 
 
-import com.alibaba.fastjson.JSONArray;
-
-import java.beans.Transient;
 import java.util.Date;
 import java.util.List;
 
@@ -12,7 +9,7 @@ import java.util.List;
  * @date 2018-08-13
  * @description 物流信息表
  */
-public class LogisticsInformation{
+public class LogisticsInformation {
     private Integer logisticsBatchID; // 发货批次表ID
     private String type; // 类型：1 采美365  2 呵呵商城 3 大宗采购'
     private Integer shopOrderID;
@@ -26,8 +23,6 @@ public class LogisticsInformation{
     private Integer shopID; //供应商ID
     private String remarks; //备注
     private Date updateDate; //最后更新时间
-
-    // -----------------
     private List<LogisticsDetailVo> logisticsDetailVos; // 格式化后的物流跟踪信息
 
     public Integer getLogisticsBatchID() {
@@ -134,9 +129,8 @@ public class LogisticsInformation{
         this.shopID = shopID;
     }
 
-    @Transient
     public List<LogisticsDetailVo> getLogisticsDetailVos() {
-        return JSONArray.parseArray(getInfo(), LogisticsDetailVo.class);
+        return logisticsDetailVos;
     }
 
     public void setLogisticsDetailVos(List<LogisticsDetailVo> logisticsDetailVos) {

src/main/java/com/caimei/modules/order/service/impl/NewShopOrderServiceImpl.java

@@ -1,5 +1,6 @@
 package com.caimei.modules.order.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.caimei.modules.club.entity.CmProductSn;
 import com.caimei.modules.order.dao.*;
 import com.caimei.modules.order.entity.*;
@@ -70,6 +71,10 @@ public class NewShopOrderServiceImpl implements NewShopOrderService {
             List<LogisticsRecord> lrs = logisticsRecordDao.findByLogisticsBatchID(l.getId());
             // 每一批的发货物流记录
             List<LogisticsInformation> lis = logisticsInformationDao.findByLogisticsBatchID(l.getId());
+            for (LogisticsInformation information : lis) {
+                List<LogisticsDetailVo> routers = JSONArray.parseArray(information.getInfo(), LogisticsDetailVo.class);
+                information.setLogisticsDetailVos(routers);
+            }
             liv.setLogisticsBatch(l);
             liv.setLogisticsInformationList(lis);
             liv.setLogisticsRecordList(lrs);

src/main/java/com/caimei/modules/shiro/auth/ShiroConfig.java

@@ -43,6 +43,7 @@ public class ShiroConfig {
         shiroFilter.setFilters(filters);
         Map<String, String> filterMap = new LinkedHashMap<>();
         filterMap.put("/user/login", "anon");
+        filterMap.put("/user/organizeInfo", "anon");
         filterMap.put("/", "anon");
         filterMap.put("/**", "auth");
         shiroFilter.setFilterChainDefinitionMap(filterMap);

src/main/java/com/caimei/modules/shiro/entity/CmMallOrganize.java

@@ -7,6 +7,8 @@ public class CmMallOrganize implements Serializable {
     private String organizeName;        //组织名称
     private String organizeLinkName;    //组织联系人
     private String mobile;          //手机号码
+    private String systemName;      //后台系统名称
+    private String systemImage;     //后台系统图标
     private String contactNumber;   //联系我们，手机或者座机号码
     private String introduction;    //关于我们:组织介绍信息
     private String afterSale;       //售后无忧
@@ -15,6 +17,22 @@ public class CmMallOrganize implements Serializable {
     private String addTime;         //添加时间
     private String delFlag;     //0 有效 其它无效
 
+    public String getSystemName() {
+        return systemName;
+    }
+
+    public void setSystemName(String systemName) {
+        this.systemName = systemName;
+    }
+
+    public String getSystemImage() {
+        return systemImage;
+    }
+
+    public void setSystemImage(String systemImage) {
+        this.systemImage = systemImage;
+    }
+
     public Integer getId() {
         return id;
     }