授权牌模板part2

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

@@ -19,6 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -133,6 +134,11 @@ public class AuthApi {
         String medicalLicenseImage = paramsMap.getString("medicalLicenseImage");
         Integer empNum = paramsMap.getInteger("empNum");
         String logo = paramsMap.getString("logo");
+        String authCode = paramsMap.getString("authCode");
+        Date authDate = paramsMap.getDate("authDate");
+        Integer authImageType = paramsMap.getInteger("authImageType");
+        String authImageLogo = paramsMap.getString("authImageLogo");
+        String authImage = paramsMap.getString("authImage");
         Integer customFlag = paramsMap.getInteger("customFlag");
         String remarks = paramsMap.getString("remarks");
         List<String> bannerList = (List<String>) paramsMap.get("bannerList");
@@ -169,6 +175,11 @@ public class AuthApi {
         auth.setMedicalLicenseImage(medicalLicenseImage);
         auth.setEmpNum(empNum);
         auth.setLogo(logo);
+        auth.setAuthCode(authCode);
+        auth.setAuthDate(authDate);
+        auth.setAuthImageLogo(authImageLogo);
+        auth.setAuthImage(authImage);
+        auth.setAuthImageType(authImageType);
         auth.setCreateBy(createBy);
         auth.setCreateSource(1);
         return authService.saveAuth(auth, bannerList, false, source);

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

@@ -167,4 +167,39 @@ public class CmBrandAuthPo {
      */
     private Integer maxParamNum;
 
+    /**
+     * 认证编号
+     */
+    private String authCode;
+
+    /**
+     * 认证日期
+     */
+    private Date authDate;
+
+    /**
+     * 授权牌logo(logo与机构名称组合)
+     */
+    private String authImageLogo;
+
+    /**
+     * 授权牌
+     */
+    private String authImage;
+
+    /**
+     * pc添加水印授权牌
+     */
+    private String pcAuthImage;
+
+    /**
+     * 小程序添加水印授权牌
+     */
+    private String appletsAuthImage;
+
+    /**
+     * 授权牌类型：1模板库生成，自定义上传
+     */
+    private Integer authImageType;
+
 }

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

@@ -13,6 +13,7 @@ import com.caimei.service.auth.AuthService;
 import com.caimei.service.auth.ShopService;
 import com.caimei.service.auth.UploadService;
 import com.caimei.utils.ExcelOperateUtil;
+import com.caimei.utils.ImageUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.tobato.fastdfs.service.FastFileStorageClient;
@@ -231,8 +232,19 @@ public class AuthServiceImpl implements AuthService {
         if (null == auth.getEmpNum()) {
             return ResponseJson.error("请输入员工人数");
         }
-        if (1 == source && null == auth.getCreateBy()) {
-            return ResponseJson.error("参数异常，请输入创建人id");
+        if (1 == source) {
+            if (null == auth.getCreateBy()) {
+                return ResponseJson.error("参数异常，请输入创建人id");
+            }
+            if (1 == auth.getAuthImageType() && StringUtils.isEmpty(auth.getAuthImageLogo())) {
+                return ResponseJson.error("授权牌logo不能为空");
+            }
+            if (2 == auth.getAuthImageType() && StringUtils.isEmpty(auth.getAuthImage())) {
+                return ResponseJson.error("授权牌不能为空");
+            }
+        }else {
+            // 机构添加默认模板库生成
+            auth.setAuthImageType(1);
         }
         if (!importFlag) {
             if (null == auth.getProvinceId() || null == auth.getCityId() || null == auth.getTownId() || StringUtils.isEmpty(auth.getAddress()) || null == auth.getLng() || null == auth.getLat()) {
@@ -266,6 +278,12 @@ public class AuthServiceImpl implements AuthService {
             // 删除原有的轮播图
             authMapper.deleteBanner(auth.getId());
         }
+        // 保存之后生成授权牌和水印授权牌
+        String authImage = auth.getAuthImage();
+        if (1 == auth.getAuthImageType()) {
+            // 模板库生成
+            authImage = generateAuthImage(auth.getId());
+        }
         // 保存轮播图
         if (null != bannerList) {
             bannerList.forEach(banner -> authMapper.insertBanner(auth.getId(), banner));
@@ -273,6 +291,10 @@ public class AuthServiceImpl implements AuthService {
         return ResponseJson.success("保存品牌授权成功", auth);
     }
 
+    private String generateAuthImage(Integer authId) {
+        AuthTemplateVo authTemplate = authMapper.getAuthTemplate(authId);
+    }
+
     @Override
     public ResponseJson auditAuth(Integer authId, Integer auditStatus, String invalidReason, Integer auditBy, Integer source) {
         if (authId == null) {

src/main/resources/mapper/AuthMapper.xml

@@ -4,12 +4,14 @@
     <insert id="insertAuth" keyColumn="id" keyProperty="id" useGeneratedKeys="true" parameterType="com.caimei.model.po.CmBrandAuthPo">
         insert into cm_brand_auth (authUserId, authParty, provinceId, cityId, townId, address, lng, lat,
                                    mobile, userMobile, firstClubType, secondClubType, medicalLicenseImage, empNum,
-                                   logo, customFlag, remarks, status, createTime, createBy, createSource, auditBy,
+                                   logo, customFlag, remarks, authCode, authDate, authImageLogo, authImage,
+                                   authImageType, status, createTime, createBy, createSource, auditBy,
                                    auditTime, auditStatus, shopAuditBy, shopAuditTime, shopAuditStatus, delFlag)
         values (#{authUserId}, #{authParty}, #{provinceId}, #{cityId}, #{townId}, #{address}, #{lng}, #{lat},
                 #{mobile}, #{userMobile}, #{firstClubType}, #{secondClubType}, #{medicalLicenseImage}, #{empNum},
-                #{logo}, #{customFlag}, #{remarks}, #{status}, NOW(), #{createBy}, #{createSource}, #{auditBy},
-                #{auditTime}, #{auditStatus}, #{shopAuditBy}, #{shopAuditTime}, #{shopAuditStatus}, #{delFlag});
+                #{logo}, #{customFlag}, #{remarks}, #{authCode}, #{authDate}, #{authImageLogo}, #{authImage},
+                #{authImageType}, #{status}, NOW(), #{createBy}, #{createSource}, #{auditBy},
+                #{auditTime}, #{auditStatus}, #{shopAuditBy}, #{shopAuditTime}, #{shopAuditStatus}, #{delFlag})
     </insert>
     <insert id="insertBanner">
         insert into cm_brand_auth_banner (authId, banner)
@@ -38,6 +40,11 @@
             logo                = #{logo},
             customFlag          = #{customFlag},
             remarks             = #{remarks},
+            authCode            = #{authCode},
+            authDate            = #{authDate},
+            authImageLogo       = #{authImageLogo},
+            authImage           = #{authImage},
+            authImageType       = #{authImageType},
             status              = #{status},
             auditStatus         = #{auditStatus},
             shopAuditStatus     = #{shopAuditStatus}