bugfix-注册链接

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

@@ -48,13 +48,13 @@ public class RegisterApi {
         if (StringUtils.isEmpty(verifyCode)) {
             return ResponseJson.error("验证码不能为空", null);
         }
-        if (StringUtils.isEmpty(password)) {
+        if (1 == registerType && StringUtils.isEmpty(password)) {
             return ResponseJson.error("密码不能为空", null);
         }
         if (null == authUserId) {
             return ResponseJson.error("供应商用户id不能为空", null);
         }
-        return registerService.simpleRegister(mobile, verifyCode, password, authUserId, null, registerType);
+        return registerService.simpleRegister(mobile, verifyCode, password, authUserId, authId, registerType);
     }
 
     @ApiOperation("全部注册")

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

@@ -14,6 +14,9 @@ public class ProductListVo {
     @ApiModelProperty("商品id")
     private Integer productId;
 
+    @ApiModelProperty("供应商用户id")
+    private Integer authUserId;
+
     @ApiModelProperty("商品名称")
     private String productName;
 

src/main/resources/mapper/AuthMapper.xml

@@ -97,7 +97,7 @@
         delete from cm_brand_auth_banner where authId = #{authId}
     </delete>
     <select id="getAuthList" resultType="com.caimei.model.vo.AuthVo">
-        select a.id as authId, authParty, cbcu2.mobile, a.status, a.auditStatus, a.shopAuditStatus, a.createTime,
+        select a.id as authId, a.authUserId, authParty, cbcu2.mobile, a.status, a.auditStatus, a.shopAuditStatus, a.createTime,
                if(a.createSource = 1,cu.name,cbcu1.mobile) as createBy,au.name as auditBy,a.auditTime,a.invalidReason,
                a.sendStatus, au1.name as shopAuditBy,a.shopAuditTime,
             ifnull(ap.waitAuditNum,0) as waitAuditNum,

src/main/resources/mapper/AuthProductMapper.xml

@@ -152,12 +152,13 @@
         where id = #{productId}
     </update>
     <select id="getProductList" resultType="com.caimei.model.vo.ProductListVo">
-        select p.id as productId,if(p.productTypeId is null,p.name,t.name) as productName,
+        select p.id as productId,a.authUserId, if(p.productTypeId is null,p.name,t.name) as productName,
                snCode,p.status,p.auditStatus,p.shopAuditStatus, p.createTime,
                if(p.createSource = 1,cu.name,cbcu.mobile) as createBy,
                au.name as auditBy,p.auditTime,p.invalidReason,au1.name as shopAuditBy,p.shopAuditTime
         from cm_brand_auth_product p
         left join cm_brand_product_type t on p.productTypeId = t.id and t.delFlag = 0
+        left join cm_brand_auth a on p.authId = a.id
         left join cm_brand_auth_user cu on p.createBy = cu.authUserId
         left join cm_brand_auth_user au on p.auditBy = au.authUserId
         left join cm_brand_auth_user au1 on p.shopAuditBy = au1.authUserId