机构授权牌物流详情

src/main/java/com/caimei/controller/auth/AuthApi.java

@@ -6,7 +6,6 @@ import com.caimei.model.ResponseJson;
 import com.caimei.model.po.CmBrandAuthPo;
 import com.caimei.model.vo.AuthFormVo;
 import com.caimei.model.vo.AuthVo;
-import com.caimei.model.vo.ProductTypeListVo;
 import com.caimei.service.auth.AuthService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -190,7 +189,7 @@ public class AuthApi {
     @ApiOperation("寄送授权牌")
     @ApiImplicitParam(name = "params", value = "authId:授权id;companyName:快递公司；companyCode:快递公司代码；logisticsNumber:快递单号；" +
             "imageList:图片备注列表；remarks:备注", required = true)
-    @PostMapping("certificate/send")
+    @PostMapping("/certificate/send")
     public ResponseJson send(@RequestBody String params) {
         JSONObject paramsMap = JSONObject.parseObject(params);
         Integer authId = paramsMap.getInteger("authId");
@@ -203,7 +202,14 @@ public class AuthApi {
     }
 
 
-
+    @ApiOperation("寄送授权牌物流详情")
+    @ApiImplicitParam(name = "params", value = "authId:授权id;", required = true)
+    @GetMapping("/certificate/logistics")
+    public ResponseJson sendDetails(@RequestBody String params) {
+        JSONObject paramsMap = JSONObject.parseObject(params);
+        Integer authId = paramsMap.getInteger("authId");
+        return authService.certificateLogistics(authId);
+    }
 
     @ApiOperation("excel导入")
     @ApiImplicitParams({

src/main/java/com/caimei/mapper/cmMapper/AuthMapper.java

@@ -6,6 +6,7 @@ import com.caimei.model.po.LdmDataPo;
 import com.caimei.model.po.TownPo;
 import com.caimei.model.vo.AuthFormVo;
 import com.caimei.model.vo.AuthVo;
+import com.caimei.model.vo.CertificateLogisticsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -82,4 +83,6 @@ public interface AuthMapper {
     void sendCertificate(CertificateLogisticsPo logistics);
 
     void updateSendStatus(Integer authId);
+
+    CertificateLogisticsVo getCertificateLogistics(Integer authId);
 }

src/main/java/com/caimei/model/po/CertificateLogisticsPo.java

@@ -43,7 +43,7 @@ public class CertificateLogisticsPo {
     /**
      * 图片备注
      */
-    private String image;
+    private String remarksImage;
 
     /**
      * 文字备注

src/main/java/com/caimei/model/vo/CertificateLogisticsVo.java

@@ -0,0 +1,69 @@
+package com.caimei.model.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * cm_brand_article
+ * @author  Aslee
+ */
+@Data
+public class CertificateLogisticsVo {
+
+    /**
+     * 机构名称
+     */
+    private Integer authParty;
+
+    /**
+     * 快递单当前的状态（0：在途，即货物处于运输过程中；1：揽件，货物已由快递公司揽收并且产生了第一条跟踪信息；2：疑难，货物寄送过程出了问题；3：签收，收件人已签收；4：退签，即货物由于用户拒签、超区等原因退回，而且发件人已经签收；5：派件，即快递正在进行同城派件；6：退回，货物正处于退回发件人的途中；）
+     */
+    private Integer state;
+
+    /**
+     * 快递公司名称
+     */
+    private String companyName;
+
+    /**
+     * 快递公司代码
+     */
+    private String companyCode;
+
+    /**
+     * 快递单号
+     */
+    private String logisticsNumber;
+
+    /**
+     * 物流跟踪信息
+     */
+    private String info;
+
+    /**
+     * 图片备注
+     */
+    private String remarksImage;
+
+    /**
+     * 图片列表
+     */
+    private List<String> imageList;
+
+    /**
+     * 文字备注
+     */
+    private String remarks;
+
+    /**
+     * 最后更新时间
+     */
+    private Date updateDate;
+
+    /**
+     * json转换物流追踪信息
+     */
+    private List<RouterVo> routerList;
+}

src/main/java/com/caimei/model/vo/RouterVo.java

@@ -0,0 +1,21 @@
+package com.caimei.model.vo;
+
+import lombok.Data;
+
+/**
+ * 物流跟踪信息描述Entity
+ * @author Administrator
+ */
+@Data
+public class RouterVo {
+
+    /**
+     * 描述
+     */
+    private String desc;
+
+    /**
+     * 时间
+     */
+    private String time;
+}

src/main/java/com/caimei/service/auth/AuthService.java

@@ -115,4 +115,11 @@ public interface AuthService {
      * 寄送机构授权牌
      */
     ResponseJson sendCertificate(Integer authId, String companyName, String companyCode, String logisticsNumber, JSONArray imageList, String remarks);
+
+    /**
+     * 寄送授权牌物流详情
+     * @param authId
+     * @return
+     */
+    ResponseJson certificateLogistics(Integer authId);
 }

src/main/java/com/caimei/service/auth/impl/AuthServiceImpl.java

@@ -7,9 +7,7 @@ import com.caimei.mapper.cmMapper.AuthProductMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.dto.ProductSaveDto;
 import com.caimei.model.po.*;
-import com.caimei.model.vo.AuthFormVo;
-import com.caimei.model.vo.AuthVo;
-import com.caimei.model.vo.ProductFormVo;
+import com.caimei.model.vo.*;
 import com.caimei.service.auth.AuthProductService;
 import com.caimei.service.auth.AuthService;
 import com.caimei.service.auth.ShopService;
@@ -175,7 +173,7 @@ public class AuthServiceImpl implements AuthService {
             }
             imageRemarks = StringUtils.join(imagePath, "##");
         }
-        logistics.setImage(imageRemarks);
+        logistics.setRemarksImage(imageRemarks);
         logistics.setType(4);
         logistics.setState(1);
         logistics.setUpdateDate(new Date());
@@ -185,6 +183,17 @@ public class AuthServiceImpl implements AuthService {
         return ResponseJson.success("寄送成功");
     }
 
+    @Override
+    public ResponseJson certificateLogistics(Integer authId) {
+        CertificateLogisticsVo certificateLogistics = authMapper.getCertificateLogistics(authId);
+        String[] imageArr = certificateLogistics.getRemarksImage().split("##");
+        List<String> imageList = Arrays.asList(imageArr);
+        certificateLogistics.setImageList(imageList);
+        List<RouterVo> routers = JSONArray.parseArray(certificateLogistics.getInfo(), RouterVo.class);
+        certificateLogistics.setRouterList(routers);
+        return ResponseJson.success(certificateLogistics);
+    }
+
     @Override
     public ResponseJson saveAuth(CmBrandAuthPo auth, List<String> bannerList, boolean importFlag, Integer source) {
         Integer authId = auth.getId();

src/main/resources/mapper/AuthMapper.xml

@@ -17,7 +17,7 @@
         insert into logistics_information (type, authId, nu, state, logisticsCompanyName, logisticsCompanyCode,
                                            updateDate, remarks, remarksImage)
         values (#{type}, #{authId}, #{logisticsNumber}, #{state}, #{companyName}, #{companyCode}, #{updateDate},
-                #{remarks}, #{image})
+                #{remarks}, #{remarksImage})
     </insert>
     <update id="updateAuthStatusByAuthId">
         update cm_brand_auth
@@ -259,4 +259,10 @@
                  left join town t on a.townId = t.townID
         where id = #{authId}
     </select>
+    <select id="getCertificateLogistics" resultType="com.caimei.model.vo.CertificateLogisticsVo">
+        select a.authParty, logisticsCompanyName as companyName, logisticsCompanyCode as companyCode, nu as logisticsNumber,
+               state, info, remarksImage, li.remarks, updateDate
+               from logistics_information li left join cm_brand_auth a on li.authId = a.id
+        where authId = #{authId}
+    </select>
 </mapper>