供应商制造商添加

pom.xml

@@ -145,21 +145,21 @@
             <version>1.26.1-RELEASE</version>
         </dependency>
         <!--引入商品模块-->
-        <dependency>
+        <!--<dependency>
             <groupId>com.caimei.module</groupId>
             <artifactId>product</artifactId>
             <version>0.0.1-SNAPSHOT</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk16</artifactId>
             <version>1.46</version>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>com.caimei.module</groupId>
             <artifactId>pay</artifactId>
             <version>0.0.1-SNAPSHOT</version>
-        </dependency>
+        </dependency>-->
         <!-- 对 HTML 富文本文档进行解析和操作 -->
         <dependency>
             <groupId>org.jsoup</groupId>

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

@@ -1,6 +1,6 @@
 package com.caimei.controller.admin.auth;
 
-import com.caimei.module.base.entity.bo.JsonModel;
+import com.caimei.model.ResponseJson;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,13 +23,13 @@ public class DefaultApi {
 
     @GetMapping("/unauthorized")
     @ApiOperation("Token失效")
-    public JsonModel unauthorized() {
-        return new JsonModel().error(-99, "Token失效请重新登录!");
+    public ResponseJson unauthorized() {
+        return ResponseJson.error(-99, "Token失效请重新登录!");
     }
 
     @GetMapping("/error")
     @ApiOperation("处理非法请求")
-    public JsonModel error() {
-        return new JsonModel().error(-100, "非法的请求!");
+    public ResponseJson error() {
+        return ResponseJson.error(-100, "非法的请求!");
     }
 }

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

@@ -140,6 +140,7 @@ public class ShopApi {
             Integer countryId = (Integer) infoMap.get("countryId");
             String brandAuthLogo = (String) infoMap.get("brandAuthLogo");
             String securityLink = (String) infoMap.get("securityLink");
+            String manufacturer = (String) infoMap.get("manufacturer");
             Integer statementType = (Integer) infoMap.get("statementType");
             String statementContent = (String) infoMap.get("statementContent");
             String statementLink = (String) infoMap.get("statementLink");
@@ -153,6 +154,7 @@ public class ShopApi {
             shopInfo.setCountryId(countryId);
             shopInfo.setBrandAuthLogo(brandAuthLogo);
             shopInfo.setSecurityLink(securityLink);
+            shopInfo.setManufacturer(manufacturer);
             shopInfo.setStatementType(statementType);
             shopInfo.setStatementContent(statementContent);
             shopInfo.setStatementLink(statementLink);

src/main/java/com/caimei/controller/wechat/WxAuthApi.java

@@ -5,7 +5,6 @@ import com.caimei.model.ResponseJson;
 import com.caimei.model.dto.ProductSaveDto;
 import com.caimei.model.po.CmBrandAuthPo;
 import com.caimei.model.vo.*;
-import com.caimei.module.base.entity.vo.AuthProductVo;
 import com.caimei.service.auth.*;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;

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

@@ -1,7 +1,6 @@
 package com.caimei.mapper.cmMapper;
 
 import com.caimei.model.vo.AddressSelectVo;
-import com.caimei.module.base.entity.vo.AddressVo;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

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

@@ -6,7 +6,6 @@ import com.caimei.model.po.TownPo;
 import com.caimei.model.vo.AuthFormVo;
 import com.caimei.model.vo.AuthVo;
 import com.caimei.model.vo.TemplateVo;
-import com.caimei.module.base.entity.po.CmBrand;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -4,9 +4,6 @@ import com.caimei.model.po.ProductParamPo;
 import com.caimei.model.po.ProductPo;
 import com.caimei.model.po.ProductTypePo;
 import com.caimei.model.vo.*;
-import com.caimei.module.base.entity.po.CmBrandProductParamPo;
-import com.caimei.module.base.entity.vo.AuthProductVo;
-import com.caimei.module.base.entity.vo.StatementFileVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -64,7 +61,7 @@ public interface AuthProductMapper {
 
     StatementFileVo getStatementFile(Integer authUserId, Integer brandId);
 
-    List<CmBrandProductParamPo> getAuthProductParams(Integer productId);
+    List<ProductParamPo> getAuthProductParams(Integer productId);
 
     List<WxProductListVo> getClubProductList(Integer authId);
 

src/main/java/com/caimei/model/dto/ProductSaveDto.java

@@ -2,8 +2,6 @@ package com.caimei.model.dto;
 
 
 import com.caimei.model.po.ProductParamPo;
-import com.caimei.module.base.entity.po.CmBrandProductParamPo;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotNull;

src/main/java/com/caimei/model/dto/ShopInfoDto.java

@@ -35,6 +35,11 @@ public class ShopInfoDto {
      */
     private String securityLink;
 
+    /**
+     * 制造商
+     */
+    private String manufacturer;
+
     /**
      * 公众号二维码图片
      */

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

@@ -0,0 +1,117 @@
+package com.caimei.model.vo;
+
+import com.caimei.model.po.ProductParamPo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Aslee
+ */
+@Data
+public class AuthProductVo {
+    /**
+     * 商品名称
+     */
+    private String productName;
+    /**
+     * 商品SN码
+     */
+    private String snCode;
+    /**
+     * 商品图片
+     */
+    private String productImage;
+    /**
+     * 供应商公众号二维码图片
+     */
+    private String qrCodeImage;
+    /**
+     * 授权牌照
+     */
+    private String certificateImage;
+    /**
+     * 品牌授权Id
+     */
+    private Integer authId;
+    /**
+     * 品牌授权logo
+     */
+    private String authLogo;
+    /**
+     * 品牌Id
+     */
+    private Integer brandId;
+    /**
+     * 品牌名称
+     */
+    private String brandName;
+    /**
+     * 产地
+     */
+    private String productionPlace;
+    /**
+     * 防伪链接
+     */
+    private String securityLink;
+    /**
+     * 制造商
+     */
+    private String manufacturer;
+    /**
+     * 供应商类型：1品牌方，2代理商
+     */
+    private Integer shopType;
+    /**
+     * 供应商名称
+     */
+    private String shopName;
+    /**
+     * 供应商用户id
+     */
+    private Integer authUserId;
+    /**
+     * 声明类型：1弹窗声明，2链接声明
+     */
+    private Integer statementType;
+    /**
+     * 声明弹窗内容
+     */
+    private String statementContent;
+    /**
+     * 声明链接
+     */
+    private String statementLink;
+    /**
+     * 声明图片
+     */
+    private String statementImage;
+    /**
+     * 声明文件
+     */
+    private StatementFileVo statementFile;
+    /**
+     * 被授权方
+     */
+    private String authParty;
+    /**
+     * 商品参数
+     */
+    private List<ProductParamPo> paramList;
+    /**
+     * pc商品图片（含水印）
+     */
+    private String pcImage;
+    /**
+     * 小程序商品图片（含水印）
+     */
+    private String appletsImage;
+    /**
+     * pc授权牌照图片（含水印）
+     */
+    private String pcCertificateImage;
+    /**
+     * 小程序授权牌照图片（含水印）
+     */
+    private String appletsCertificateImage;
+}

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

@@ -34,6 +34,11 @@ public class ShopInfoVo {
      */
     private String securityLink;
 
+    /**
+     * 制造商
+     */
+    private String manufacturer;
+
     /**
      * 代理声明类型：1弹窗，2链接，3图片，4文件
      */

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

@@ -0,0 +1,15 @@
+package com.caimei.model.vo;
+
+import com.caimei.model.po.CmBrandAuthFilePo;
+import lombok.Data;
+
+/**
+ * @author Aslee
+ */
+@Data
+public class StatementFileVo extends CmBrandAuthFilePo {
+    /**
+     * 访问声明文件链接
+     */
+    private String url;
+}

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

@@ -3,8 +3,6 @@ package com.caimei.service.auth;
 
 import com.caimei.model.ResponseJson;
 import com.caimei.model.vo.AddressSelectVo;
-import com.caimei.module.base.entity.vo.AddressVo;
-import com.github.pagehelper.PageInfo;
 
 import java.util.List;
 

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

@@ -4,7 +4,6 @@ import com.caimei.model.ResponseJson;
 import com.caimei.model.dto.ProductSaveDto;
 import com.caimei.model.po.ProductTypePo;
 import com.caimei.model.vo.*;
-import com.caimei.module.base.entity.vo.AuthProductVo;
 import com.github.pagehelper.PageInfo;
 
 import java.io.IOException;
@@ -52,7 +51,6 @@ public interface AuthProductService {
 
     /**
      * 添加/编辑授权商品
-     * @param source  来源：1供应商保存，2机构保存
      *
      * @param productSaveDto {
      *                       productId              授权商品id

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

@@ -9,7 +9,6 @@ import com.caimei.model.po.CmBrandAuthPo;
 import com.caimei.model.po.TownPo;
 import com.caimei.model.vo.AddressSelectVo;
 import com.caimei.model.vo.RossAddressVo;
-import com.caimei.module.base.entity.vo.TownVo;
 import com.caimei.service.auth.AddressService;
 import com.caimei.service.auth.UploadService;
 import com.caimei.utils.RequestUtil;

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

@@ -11,8 +11,6 @@ import com.caimei.model.po.ProductParamPo;
 import com.caimei.model.po.ProductPo;
 import com.caimei.model.po.ProductTypePo;
 import com.caimei.model.vo.*;
-import com.caimei.module.base.entity.vo.AuthProductVo;
-import com.caimei.module.base.entity.vo.StatementFileVo;
 import com.caimei.service.auth.AuthProductService;
 import com.caimei.service.auth.UploadService;
 import com.caimei.utils.Base64Util;

src/main/java/com/caimei/task/LdmTask.java

@@ -5,7 +5,6 @@ import com.caimei.mapper.ldmMapper.LdmMapper;
 import com.caimei.model.po.CmBrandAuthPo;
 import com.caimei.model.po.LdmDataPo;
 import com.caimei.model.po.TownPo;
-import com.caimei.module.base.entity.po.Town;
 import com.caimei.service.auth.UploadService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/caimei/utils/ExcelNumberFormatter.java

@@ -1,41 +0,0 @@
-package com.caimei.utils;
-
-import com.caimei.module.pay.util.MathUtil;
-import org.apache.commons.lang.StringUtils;
-
-public class ExcelNumberFormatter {
-	
-	public String format(String bigDecimal){
-		if(bigDecimal == null){
-			return StringUtils.EMPTY;
-		}else{
-			return MathUtil.round(bigDecimal,2).toString();
-		}
-	}
-
-	public Double formatStr(String bigDecimal){
-		if(bigDecimal == null){
-			return 0.00;
-		}else{
-			return MathUtil.round(bigDecimal,2).doubleValue();
-		}
-	}
-
-	public String formatDouble(Double number){
-		if(number == null){
-			return StringUtils.EMPTY;
-		}else{
-			return MathUtil.round(number.toString(),2).toString();
-		}
-	}
-
-	public String addStr(Object str1, Object str2) {
-		if (str1 == null || str2 == null) return "";
-		return str1.toString() + str2.toString();
-	}
-
-	public String addStrings(Object str1, Object str2, Object str3, Object str4) {
-		if (str1 == null || str2 == null || str3 == null || str4 == null) return "";
-		return str1.toString() + str2.toString() + str3.toString() + str4.toString();
-	}
-}

src/main/java/com/caimei/utils/SmsUtils.java

@@ -2,7 +2,6 @@ package com.caimei.utils;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.caimei.module.pay.util.HttpRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;

src/main/resources/mapper/AuthProductMapper.xml

@@ -297,7 +297,7 @@
         where authId = #{authId}
         order by p.createTime desc
     </select>
-    <select id="getAuthProductByProductId" resultType="com.caimei.module.base.entity.vo.AuthProductVo">
+    <select id="getAuthProductByProductId" resultType="com.caimei.model.vo.AuthProductVo">
         select t.name       as productName,
                p.snCode,
                t.image as pcImage,
@@ -315,6 +315,7 @@
                u.shopType,
                u.qrCodeImage,
                i.securityLink,
+               i.manufacturer,
                i.statementType,
                i.statementContent,
                i.statementLink,
@@ -335,15 +336,15 @@
           and t.status = 1
           and t.auditStatus = 1
     </select>
-    <select id="getStatementFile" resultType="com.caimei.module.base.entity.vo.StatementFileVo">
+    <select id="getStatementFile" resultType="com.caimei.model.vo.StatementFileVo">
         select name,ossName,md5Hex,uploadTime
         from cm_brand_auth_file
         where authUserId = #{authUserId}
           and brandId = #{brandId}
         limit 1
     </select>
-    <select id="getAuthProductParams" resultType="com.caimei.module.base.entity.po.CmBrandProductParamPo">
-        select name, content
+    <select id="getAuthProductParams" resultType="com.caimei.model.po.ProductParamPo">
+        select name as paramName, content as paramContent
         from cm_brand_product_param
         where productId = #{productId}
     </select>

src/main/resources/mapper/ShopMapper.xml

@@ -13,7 +13,7 @@
     <insert id="insertShopInfo">
         insert into cm_brand_auth_shop_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            authUserId,brandId,countryId,securityLink,
+            authUserId,brandId,countryId,securityLink,manufacturer,
             <if test="statementType != null">
                 statementType,
             </if>
@@ -28,7 +28,7 @@
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            #{authUserId},#{brandId},#{countryId},#{securityLink},
+            #{authUserId},#{brandId},#{countryId},#{securityLink},#{manufacturer},
             <if test="statementType != null">
                 #{statementType},
             </if>
@@ -73,7 +73,7 @@
     <update id="updateShopInfo">
         update cm_brand_auth_shop_info
         <set>
-            countryId=#{countryId},securityLink = #{securityLink},
+            countryId=#{countryId},securityLink = #{securityLink},manufacturer = #{manufacturer},
             <if test="statementType != null">
                 statementType = #{statementType},
             </if>
@@ -283,6 +283,7 @@
         select i.brandId,
                i.countryId,
                i.securityLink,
+               i.manufacturer,
                i.statementType,
                i.statementContent,
                i.statementLink,