查看商品资质信息

src/main/java/com/caimei365/order/controller/ShipApi.java

@@ -3,10 +3,7 @@ package com.caimei365.order.controller;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.LogisticsBatchDto;
 import com.caimei365.order.model.dto.LogisticsDto;
-import com.caimei365.order.model.vo.CompanyVo;
-import com.caimei365.order.model.vo.LogisticsRecordVo;
-import com.caimei365.order.model.vo.SettlementVo;
-import com.caimei365.order.model.vo.ShopOrderVo;
+import com.caimei365.order.model.vo.*;
 import com.caimei365.order.service.ShipService;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.*;
@@ -317,6 +314,17 @@ public class ShipApi {
      */
 
 
-
+    /**
+     * 查看商品资质信息
+     */
+    @ApiOperation("查看商品资质信息（旧：/supplier/qualification/data）")
+    @ApiImplicitParam(required = true, name = "logisticsInfoId", value = "发货物流信息Id")
+    @GetMapping("/product/qualification")
+    public ResponseJson<List<QualificationVo>> getProductQualification(Integer logisticsBatchId) {
+        if (null == logisticsBatchId) {
+            return ResponseJson.error("发货物流信息Id不能为空！", null);
+        }
+        return shipService.getProductQualification(logisticsBatchId);
+    }
 
 }

src/main/java/com/caimei365/order/mapper/ShipMapper.java

@@ -1,9 +1,6 @@
 package com.caimei365.order.mapper;
 
-import com.caimei365.order.model.po.LogisticsBatchPo;
-import com.caimei365.order.model.po.LogisticsInformationPo;
-import com.caimei365.order.model.po.LogisticsRecordPo;
-import com.caimei365.order.model.po.PayShopRecordPo;
+import com.caimei365.order.model.po.*;
 import com.caimei365.order.model.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -166,6 +163,16 @@ public interface ShipMapper {
      * 更新发货分享码
      */
     void updateShipShareCode(OrderShareCodeVo orderCodeVo);
-
-
+    /**
+     * 查看商品资质信息
+     */
+    List<QualificationVo> getProductQualification(Integer logisticsBatchId);
+    /**
+     * 查询商品资质图片
+     */
+    List<String> getQualificationImage(Integer recordId);
+    /**
+     * 查询商品资质文件
+     */
+    List<QualificationPo> getQualificationFile(Integer recordId);
 }

src/main/java/com/caimei365/order/model/po/QualificationPo.java

@@ -0,0 +1,32 @@
+package com.caimei365.order.model.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/8/12
+ */
+@Data
+public class QualificationPo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 商品发货记录id,对应(cm_logistics_record)id
+     */
+    private Integer recordId;
+    /**
+     * 资质文件名称
+     */
+    private String fileName;
+    /**
+     * oss服务器文件名称
+     */
+    private String ossName;
+}

src/main/java/com/caimei365/order/model/vo/QualificationVo.java

@@ -0,0 +1,45 @@
+package com.caimei365.order.model.vo;
+
+import com.caimei365.order.model.po.QualificationPo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2021/8/12
+ */
+@Data
+public class QualificationVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 商品发货记录id
+     */
+    private Integer recordId;
+    /**
+     * 商品名称
+     */
+    private String productName;
+    /**
+     * SN码,多个用逗号隔开
+     */
+    private String sn;
+    /**
+     * 上传商品资质时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date uploadTime;
+    /**
+     * 商品资质图片
+     */
+    private List<String> imageList;
+    /**
+     * 商品资质文件
+     */
+    private List<QualificationPo> fileList;
+}

src/main/java/com/caimei365/order/service/ShipService.java

@@ -3,10 +3,7 @@ package com.caimei365.order.service;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.LogisticsBatchDto;
 import com.caimei365.order.model.dto.LogisticsDto;
-import com.caimei365.order.model.vo.CompanyVo;
-import com.caimei365.order.model.vo.LogisticsRecordVo;
-import com.caimei365.order.model.vo.SettlementVo;
-import com.caimei365.order.model.vo.ShopOrderVo;
+import com.caimei365.order.model.vo.*;
 import com.github.pagehelper.PageInfo;
 import org.springframework.http.HttpHeaders;
 
@@ -140,6 +137,9 @@ public interface ShipService {
      * @param headers HttpHeaders
      */
     ResponseJson<Map<String, Object>> checkShipShareCode(Integer source, Integer shopOrderId, String shareCode, String code, String encryptedData, String iv, HttpHeaders headers);
-
-
+    /**
+     * 查看商品资质信息
+     * @param logisticsBatchId 发货物流批次Id
+     */
+    ResponseJson<List<QualificationVo>> getProductQualification(Integer logisticsBatchId);
 }

src/main/java/com/caimei365/order/service/impl/ShipServiceImpl.java

@@ -9,10 +9,7 @@ import com.caimei365.order.mapper.ShipMapper;
 import com.caimei365.order.model.ResponseJson;
 import com.caimei365.order.model.dto.LogisticsBatchDto;
 import com.caimei365.order.model.dto.LogisticsDto;
-import com.caimei365.order.model.po.LogisticsBatchPo;
-import com.caimei365.order.model.po.LogisticsInformationPo;
-import com.caimei365.order.model.po.LogisticsRecordPo;
-import com.caimei365.order.model.po.PayShopRecordPo;
+import com.caimei365.order.model.po.*;
 import com.caimei365.order.model.vo.*;
 import com.caimei365.order.service.RemoteCallService;
 import com.caimei365.order.service.ShipService;
@@ -830,5 +827,32 @@ public class ShipServiceImpl implements ShipService {
         }
     }
 
+    /**
+     * 查看商品资质信息
+     *
+     * @param logisticsBatchId 发货物流批次Id
+     */
+    @Override
+    public ResponseJson<List<QualificationVo>> getProductQualification(Integer logisticsBatchId) {
+        // 商品资质信息
+        List<QualificationVo> qualificationList = shipMapper.getProductQualification(logisticsBatchId);
+        Iterator<QualificationVo> iterator = qualificationList.iterator();
+        while (iterator.hasNext()) {
+            QualificationVo qualification = iterator.next();
+            // 商品资质图片
+            List<String> images = shipMapper.getQualificationImage(qualification.getRecordId());
+            qualification.setImageList(images);
+            // 商品资质文件
+            List<QualificationPo> fileList = shipMapper.getQualificationFile(qualification.getRecordId());
+            qualification.setFileList(fileList);
+            boolean isFile = (fileList == null || fileList.size() == 0);
+            boolean isImage = (images == null || images.size() == 0);
+            if (StringUtils.isBlank(qualification.getSn()) && isFile && isImage) {
+                iterator.remove();
+            }
+        }
+        return ResponseJson.success(qualificationList);
+    }
+
 
 }

src/main/resources/mapper/ShipMapper.xml

@@ -334,5 +334,22 @@
             image
         FROM cm_logistics_record WHERE logisticsBatchID = #{logisticsBatchId}
     </select>
+    <select id="getProductQualification" resultType="com.caimei365.order.model.vo.QualificationVo">
+        SELECT
+            id AS recordId,
+            productName,
+            sn,
+            uploadTime
+        FROM cm_logistics_record
+        WHERE logisticsBatchID = #{logisticsBatchId}
+    </select>
+    <select id="getQualificationImage" resultType="java.lang.String">
+        SELECT image FROM cm_qualification_image WHERE recordId = #{recordId}
+    </select>
+    <select id="getQualificationFile" resultType="com.caimei365.order.model.po.QualificationPo">
+        SELECT fileName, ossName
+        FROM cm_qualification_file
+        WHERE recordId = #{recordId}
+    </select>
 
 </mapper>