Browse Source

ross认证通part2

Aslee 2 years ago
parent
commit
1741356b01

+ 7 - 5
src/main/java/com/caimei/controller/auth/AuthApi.java

@@ -1,5 +1,6 @@
 package com.caimei.controller.auth;
 package com.caimei.controller.auth;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.po.CmBrandAuthPo;
 import com.caimei.model.po.CmBrandAuthPo;
@@ -187,17 +188,18 @@ public class AuthApi {
 
 
 
 
     @ApiOperation("寄送授权牌")
     @ApiOperation("寄送授权牌")
-    @ApiImplicitParam(name = "params", value = "authId:授权id;logisticsCompany:快递公司;logisticsNumber:快递单号;" +
-            "image:图片备注;remarks:备注", required = true)
+    @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) {
     public ResponseJson send(@RequestBody String params) {
         JSONObject paramsMap = JSONObject.parseObject(params);
         JSONObject paramsMap = JSONObject.parseObject(params);
         Integer authId = paramsMap.getInteger("authId");
         Integer authId = paramsMap.getInteger("authId");
-        String logisticsCompany = paramsMap.getString("logisticsCompany");
+        String companyName = paramsMap.getString("companyName");
+        String companyCode = paramsMap.getString("companyCode");
         String logisticsNumber = paramsMap.getString("logisticsNumber");
         String logisticsNumber = paramsMap.getString("logisticsNumber");
-        String image = paramsMap.getString("image");
+        JSONArray imageList = paramsMap.getJSONArray("imageList");
         String remarks = paramsMap.getString("remarks");
         String remarks = paramsMap.getString("remarks");
-        return authService.sendCertificate(authId, logisticsCompany, logisticsNumber, image, remarks);
+        return authService.sendCertificate(authId, companyName, companyCode, logisticsNumber, imageList, remarks);
     }
     }
 
 
 
 

+ 5 - 0
src/main/java/com/caimei/mapper/cmMapper/AuthMapper.java

@@ -1,5 +1,6 @@
 package com.caimei.mapper.cmMapper;
 package com.caimei.mapper.cmMapper;
 
 
+import com.caimei.model.po.CertificateLogisticsPo;
 import com.caimei.model.po.CmBrandAuthPo;
 import com.caimei.model.po.CmBrandAuthPo;
 import com.caimei.model.po.LdmDataPo;
 import com.caimei.model.po.LdmDataPo;
 import com.caimei.model.po.TownPo;
 import com.caimei.model.po.TownPo;
@@ -77,4 +78,8 @@ public interface AuthMapper {
     AuthVo getAuthById(Integer authId);
     AuthVo getAuthById(Integer authId);
 
 
     void updateAuthShopAuditStatus(@Param("authId") Integer authId, @Param("shopAuditStatus") Integer auditStatus, @Param("shopInvalidReason") String invalidReason, @Param("shopAuditTime") Date auditTime);
     void updateAuthShopAuditStatus(@Param("authId") Integer authId, @Param("shopAuditStatus") Integer auditStatus, @Param("shopInvalidReason") String invalidReason, @Param("shopAuditTime") Date auditTime);
+
+    void sendCertificate(CertificateLogisticsPo logistics);
+
+    void updateSendStatus(Integer authId);
 }
 }

+ 57 - 0
src/main/java/com/caimei/model/po/CertificateLogisticsPo.java

@@ -0,0 +1,57 @@
+package com.caimei.model.po;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * cm_brand_article
+ * @author  Aslee
+ */
+@Data
+public class CertificateLogisticsPo {
+    /**
+     * 类型:1 采美365  2 呵呵商城 3 大宗采购 4认证通
+     */
+    private Integer type;
+
+    /**
+     * 机构id
+     */
+    private Integer authId;
+
+    /**
+     * 快递单当前的状态(0:在途,即货物处于运输过程中;1:揽件,货物已由快递公司揽收并且产生了第一条跟踪信息;2:疑难,货物寄送过程出了问题;3:签收,收件人已签收;4:退签,即货物由于用户拒签、超区等原因退回,而且发件人已经签收;5:派件,即快递正在进行同城派件;6:退回,货物正处于退回发件人的途中;)
+     */
+    private Integer state;
+
+    /**
+     * 快递公司名称
+     */
+    private String companyName;
+
+    /**
+     * 快递公司代码
+     */
+    private String companyCode;
+
+    /**
+     * 快递单号
+     */
+    private String logisticsNumber;
+
+    /**
+     * 图片备注
+     */
+    private String image;
+
+    /**
+     * 文字备注
+     */
+    private String remarks;
+
+    /**
+     * 最后更新时间
+     */
+    private Date updateDate;
+}

+ 2 - 1
src/main/java/com/caimei/service/auth/AuthService.java

@@ -1,5 +1,6 @@
 package com.caimei.service.auth;
 package com.caimei.service.auth;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.po.CmBrandAuthPo;
 import com.caimei.model.po.CmBrandAuthPo;
 import com.caimei.model.vo.AuthFormVo;
 import com.caimei.model.vo.AuthFormVo;
@@ -113,5 +114,5 @@ public interface AuthService {
     /**
     /**
      * 寄送机构授权牌
      * 寄送机构授权牌
      */
      */
-    ResponseJson sendCertificate(Integer authId, String logisticsCompany, String logisticsNumber, String image, String remarks);
+    ResponseJson sendCertificate(Integer authId, String companyName, String companyCode, String logisticsNumber, JSONArray imageList, String remarks);
 }
 }

+ 25 - 7
src/main/java/com/caimei/service/auth/impl/AuthServiceImpl.java

@@ -1,14 +1,12 @@
 package com.caimei.service.auth.impl;
 package com.caimei.service.auth.impl;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.caimei.config.FastDfsClient;
 import com.caimei.config.FastDfsClient;
 import com.caimei.mapper.cmMapper.AuthMapper;
 import com.caimei.mapper.cmMapper.AuthMapper;
 import com.caimei.mapper.cmMapper.AuthProductMapper;
 import com.caimei.mapper.cmMapper.AuthProductMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.dto.ProductSaveDto;
 import com.caimei.model.dto.ProductSaveDto;
-import com.caimei.model.po.AuthImportPo;
-import com.caimei.model.po.CmBrandAuthPo;
-import com.caimei.model.po.LdmDataPo;
-import com.caimei.model.po.ProductParamPo;
+import com.caimei.model.po.*;
 import com.caimei.model.vo.AuthFormVo;
 import com.caimei.model.vo.AuthFormVo;
 import com.caimei.model.vo.AuthVo;
 import com.caimei.model.vo.AuthVo;
 import com.caimei.model.vo.ProductFormVo;
 import com.caimei.model.vo.ProductFormVo;
@@ -162,9 +160,29 @@ public class AuthServiceImpl implements AuthService {
     }
     }
 
 
     @Override
     @Override
-    public ResponseJson sendCertificate(Integer authId, String logisticsCompany, String logisticsNumber, String image, String remarks) {
-
-        return null;
+    public ResponseJson sendCertificate(Integer authId, String companyName, String companyCode, String logisticsNumber, JSONArray imageList, String remarks) {
+        CertificateLogisticsPo logistics = new CertificateLogisticsPo();
+        logistics.setAuthId(authId);
+        logistics.setCompanyName(companyName);
+        logistics.setCompanyCode(companyCode);
+        logistics.setLogisticsNumber(logisticsNumber);
+        logistics.setRemarks(remarks);
+        String imageRemarks = "";
+        if (null != imageList){
+            String[] imagePath = new String[imageList.size()];
+            for (int i = 0; i < imagePath.length; i++) {
+                imagePath[i] = imageList.get(i).toString();
+            }
+            imageRemarks = StringUtils.join(imagePath, "##");
+        }
+        logistics.setImage(imageRemarks);
+        logistics.setType(4);
+        logistics.setState(1);
+        logistics.setUpdateDate(new Date());
+        authMapper.sendCertificate(logistics);
+        // 更改机构寄送状态
+        authMapper.updateSendStatus(authId);
+        return ResponseJson.success("寄送成功");
     }
     }
 
 
     @Override
     @Override

+ 11 - 0
src/main/resources/mapper/AuthMapper.xml

@@ -13,6 +13,12 @@
         insert into cm_brand_auth_banner (authId, banner)
         insert into cm_brand_auth_banner (authId, banner)
         VALUES (#{authId}, #{banner})
         VALUES (#{authId}, #{banner})
     </insert>
     </insert>
+    <insert id="sendCertificate">
+        insert into logistics_information (type, authId, nu, state, logisticsCompanyName, logisticsCompanyCode,
+                                           updateDate, remarks, remarksImage)
+        values (#{type}, #{authId}, #{logisticsNumber}, #{state}, #{companyName}, #{companyCode}, #{updateDate},
+                #{remarks}, #{image})
+    </insert>
     <update id="updateAuthStatusByAuthId">
     <update id="updateAuthStatusByAuthId">
         update cm_brand_auth
         update cm_brand_auth
         set status = #{status}
         set status = #{status}
@@ -61,6 +67,11 @@
             shopAuditTime     = #{shopAuditTime}
             shopAuditTime     = #{shopAuditTime}
         where id = #{authId}
         where id = #{authId}
     </update>
     </update>
+    <update id="updateSendStatus">
+        update cm_brand_auth
+        set sendStatus = 1
+        where id = #{authId}
+    </update>
     <delete id="deleteBanner">
     <delete id="deleteBanner">
         delete from cm_brand_auth_banner where authId = #{authId}
         delete from cm_brand_auth_banner where authId = #{authId}
     </delete>
     </delete>