增加官网的地址到配置文件里
This commit is contained in:
parent
fa874887a3
commit
7ac8d00ede
@ -114,6 +114,9 @@ public class EsignPlatformInfo implements Serializable {
|
|||||||
@ApiModelProperty(value = "邀请码,后期跟收益有关")
|
@ApiModelProperty(value = "邀请码,后期跟收益有关")
|
||||||
private String invite_code;
|
private String invite_code;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "代理商邀请链接")
|
||||||
|
private String invite_url;
|
||||||
|
|
||||||
@ApiModelProperty(value = "县级市代理商设定的配送费(单位:分)")
|
@ApiModelProperty(value = "县级市代理商设定的配送费(单位:分)")
|
||||||
private Integer shipping_fee;
|
private Integer shipping_fee;
|
||||||
|
|
||||||
@ -123,7 +126,7 @@ public class EsignPlatformInfo implements Serializable {
|
|||||||
@ApiModelProperty(value = "分账比例值,取值范围:[0.01,1.00]")
|
@ApiModelProperty(value = "分账比例值,取值范围:[0.01,1.00]")
|
||||||
private BigDecimal split_ratio;
|
private BigDecimal split_ratio;
|
||||||
|
|
||||||
@ApiModelProperty(value = "状态:1-已审核通过;2-审核未通过;3-待审中;")
|
@ApiModelProperty(value = "状态:0-未申请过;1-已审核通过;2-审核未通过;3-待审中;")
|
||||||
private Integer status;
|
private Integer status;
|
||||||
|
|
||||||
@ApiModelProperty(value = "审核代理商备注")
|
@ApiModelProperty(value = "审核代理商备注")
|
||||||
|
|||||||
@ -29,6 +29,7 @@ import com.suisung.mall.shop.esign.service.EsignPlatformInfoService;
|
|||||||
import com.suisung.mall.shop.lakala.service.LklLedgerReceiverService;
|
import com.suisung.mall.shop.lakala.service.LklLedgerReceiverService;
|
||||||
import com.suisung.mall.shop.store.service.ShopMchEntryService;
|
import com.suisung.mall.shop.store.service.ShopMchEntryService;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.context.annotation.Lazy;
|
import org.springframework.context.annotation.Lazy;
|
||||||
import org.springframework.data.util.Pair;
|
import org.springframework.data.util.Pair;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@ -46,6 +47,9 @@ import static com.suisung.mall.common.utils.ContextUtil.getCurrentUser;
|
|||||||
@Service
|
@Service
|
||||||
public class EsignPlatformInfoServiceImpl extends BaseServiceImpl<EsignPlatformInfoMapper, EsignPlatformInfo> implements EsignPlatformInfoService {
|
public class EsignPlatformInfoServiceImpl extends BaseServiceImpl<EsignPlatformInfoMapper, EsignPlatformInfo> implements EsignPlatformInfoService {
|
||||||
|
|
||||||
|
@Value("${website.domain}")
|
||||||
|
private String websiteDomain;
|
||||||
|
|
||||||
@Lazy
|
@Lazy
|
||||||
@Resource
|
@Resource
|
||||||
private ShopMchEntryService shopMchEntryService;
|
private ShopMchEntryService shopMchEntryService;
|
||||||
@ -614,7 +618,15 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl<EsignPlatformI
|
|||||||
.orderByAsc(EsignPlatformInfo::getId);
|
.orderByAsc(EsignPlatformInfo::getId);
|
||||||
EsignPlatformInfo record = getOne(queryWrapper, false);
|
EsignPlatformInfo record = getOne(queryWrapper, false);
|
||||||
if (ObjectUtil.isEmpty(record)) {
|
if (ObjectUtil.isEmpty(record)) {
|
||||||
return CommonResult.failed("您尚未申请代理商入驻");
|
record = new EsignPlatformInfo();
|
||||||
|
record.setStatus(CommonConstant.Disable);//状态:0-未申请过;1-已审核通过;2-审核未通过;3-待审中;
|
||||||
|
record.setRemark("您尚未申请代理商入驻");
|
||||||
|
return CommonResult.success(record, "您尚未申请代理商入驻");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 官网的邀请链接
|
||||||
|
if (CommonConstant.Enable.equals(record.getStatus())) {
|
||||||
|
record.setInvite_url(websiteDomain + "/start?invite_code=" + record.getInvite_code());
|
||||||
}
|
}
|
||||||
|
|
||||||
return CommonResult.success(record);
|
return CommonResult.success(record);
|
||||||
|
|||||||
@ -150,6 +150,7 @@ logging:
|
|||||||
springfox: error
|
springfox: error
|
||||||
# 项目主域名
|
# 项目主域名
|
||||||
main_domain: @project.domain@
|
main_domain: @project.domain@
|
||||||
|
website_domain: @project.website@
|
||||||
# 个推
|
# 个推
|
||||||
getui:
|
getui:
|
||||||
# Url前缀
|
# Url前缀
|
||||||
|
|||||||
@ -150,6 +150,7 @@ logging:
|
|||||||
springfox: error
|
springfox: error
|
||||||
# 项目主域名
|
# 项目主域名
|
||||||
main_domain: @project.domain@
|
main_domain: @project.domain@
|
||||||
|
website_domain: @project.website@
|
||||||
# 个推
|
# 个推
|
||||||
getui:
|
getui:
|
||||||
# Url前缀
|
# Url前缀
|
||||||
|
|||||||
@ -163,6 +163,7 @@ logging:
|
|||||||
springfox: error
|
springfox: error
|
||||||
# 项目主域名
|
# 项目主域名
|
||||||
main_domain: @project.domain@
|
main_domain: @project.domain@
|
||||||
|
website_domain: @project.website@
|
||||||
# 个推
|
# 个推
|
||||||
getui:
|
getui:
|
||||||
# Url前缀
|
# Url前缀
|
||||||
|
|||||||
@ -154,6 +154,7 @@ logging:
|
|||||||
springfox: error
|
springfox: error
|
||||||
# 项目主域名
|
# 项目主域名
|
||||||
main_domain: @project.domain@
|
main_domain: @project.domain@
|
||||||
|
website_domain: @project.website@
|
||||||
# 个推
|
# 个推
|
||||||
getui:
|
getui:
|
||||||
# Url前缀
|
# Url前缀
|
||||||
|
|||||||
@ -154,6 +154,7 @@ logging:
|
|||||||
springfox: error
|
springfox: error
|
||||||
# 项目主域名
|
# 项目主域名
|
||||||
main_domain: @project.domain@
|
main_domain: @project.domain@
|
||||||
|
website_domain: @project.website@
|
||||||
# 个推
|
# 个推
|
||||||
getui:
|
getui:
|
||||||
# Url前缀
|
# Url前缀
|
||||||
|
|||||||
1
pom.xml
1
pom.xml
@ -351,6 +351,7 @@
|
|||||||
<!-- 图片上传配置 -->
|
<!-- 图片上传配置 -->
|
||||||
<upload.filepath>D:/wwwroot/mall/public/static</upload.filepath>
|
<upload.filepath>D:/wwwroot/mall/public/static</upload.filepath>
|
||||||
<!--项目域名-->
|
<!--项目域名-->
|
||||||
|
<project.website>https://www.gpxscs.cn </project.website>
|
||||||
<project.domain>https://mall.gpxscs.cn</project.domain>
|
<project.domain>https://mall.gpxscs.cn</project.domain>
|
||||||
<project.static_domain>https://static.gpxscs.cn</project.static_domain>
|
<project.static_domain>https://static.gpxscs.cn</project.static_domain>
|
||||||
</properties>
|
</properties>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user