正品联盟优化

base-module/src/main/java/com/caimei/module/base/entity/vo/AuthProductVo.java

@@ -46,10 +46,6 @@ public class AuthProductVo {
      * 防伪链接
      */
     private String securityLink;
-    /**
-     * 代理商名称
-     */
-    private String agentName;
     /**
      * 供应商类型：1品牌方，2代理商
      */

product/src/main/resources/com-caimei-module-product/ProductModuleMapper.xml

@@ -605,8 +605,8 @@
                a.authParty,
                u.authUserId as authUserId,
                u.name  as shopName,
+               u.shopType,
                i.securityLink,
-               i.type  as shopType,
                i.statementType,
                i.statementContent,
                i.statementLink,
@@ -614,10 +614,10 @@
         from cm_brand_auth_product p
                  left join cm_brand_auth a on p.authId = a.id
                  left join cm_brand_auth_user u on a.authUserId = u.authUserId
-                 left join cm_brand_auth_shop_info i on u.authUserId = i.authUserId
+                 left join cm_brand_auth_shop_info i on u.authUserId = i.authUserId and p.brandId = i.brandId
                  left join cm_brand b on i.brandId = b.id
                  left join country c on i.countryId = c.countryId
-        where p.id = #{productId} and p.status = 1
+        where p.id = #{productId} and u.status = 1 and a.status = 1 and p.status = 1
     </select>
     <select id="getParamsByProductId" resultType="com.caimei.module.base.entity.po.CmBrandProductParamPo">
         select name,content from cm_brand_product_param where productId = #{productId}