提交 3e27845f 作者: zhenjie

加盟商列表返回后台用户id

上级 1ac929ee
...@@ -50,8 +50,10 @@ public class CompanyInfoVO implements Serializable { ...@@ -50,8 +50,10 @@ public class CompanyInfoVO implements Serializable {
private String phoneNum; private String phoneNum;
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private String remark; private String remark;
@ApiModelProperty(value = "用户id") @ApiModelProperty(value = "小程序用户id")
private Integer userAccountId; private Integer userAccountId;
@ApiModelProperty(value = "后台用户id")
private Integer backUserAccountId;
@ApiModelProperty(value = "纬度") @ApiModelProperty(value = "纬度")
private Double lat; private Double lat;
@ApiModelProperty(value = "经度") @ApiModelProperty(value = "经度")
......
...@@ -65,6 +65,7 @@ public class CompanyInfoDO implements Serializable { ...@@ -65,6 +65,7 @@ public class CompanyInfoDO implements Serializable {
return CompanyInfoVO.builder().id(id).companyType(companyType).companyName(companyName).fullName(fullName).province(province) return CompanyInfoVO.builder().id(id).companyType(companyType).companyName(companyName).fullName(fullName).province(province)
.brandName(brandName) .brandName(brandName)
.brandLogo(brandLogo) .brandLogo(brandLogo)
.backUserAccountId(backUserAccountId)
.userAccountId(userAccountId) .userAccountId(userAccountId)
.lon(this.lon).lat(this.lat).creditCode(this.creditCode).licenseImg(this.licenseImg).leader(this.leader) .lon(this.lon).lat(this.lat).creditCode(this.creditCode).licenseImg(this.licenseImg).leader(this.leader)
.city(city).district(district).address(address).companyUserName(companyUserName).phoneNum(phoneNum).remark(remark) .city(city).district(district).address(address).companyUserName(companyUserName).phoneNum(phoneNum).remark(remark)
......
...@@ -453,11 +453,13 @@ ...@@ -453,11 +453,13 @@
ci.score, ci.score,
ci.brand_name, ci.brand_name,
ci.brand_logo, ci.brand_logo,
cbu.back_user_account_id,
st_distance_sphere(point(ci.lon, ci.lat), point(${lon}, ${lat})) AS distance st_distance_sphere(point(ci.lon, ci.lat), point(${lon}, ${lat})) AS distance
FROM user_apply_tag uat FROM user_apply_tag uat
INNER JOIN cooperation_tag ct ON uat.cooperation_tag_id = ct.id INNER JOIN cooperation_tag ct ON uat.cooperation_tag_id = ct.id
INNER JOIN company_member cm ON cm.user_account_id = uat.user_account_id INNER JOIN company_member cm ON cm.user_account_id = uat.user_account_id
INNER JOIN company_info ci ON cm.company_info_id = ci.id INNER JOIN company_info ci ON cm.company_info_id = ci.id
INNER JOIN company_back_user cbu ON cbu.company_info_id = ci.id
WHERE ct.id = #{coopId} WHERE ct.id = #{coopId}
and uat.is_deleted = 0 and uat.apply_status = 1 and uat.is_deleted = 0 and uat.apply_status = 1
ORDER BY distance ASC ORDER BY distance ASC
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论