suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ec 意向区域回显

Browse Source
This commit is contained in:
苏竹红
2023-09-14 19:22:39 +08:00
parent 3cd74dcddc
commit 0d0c08ead2
9 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-dao/src/main/resources/mapper/HyPartnerIntentInfoMapper.xml
View File

@@ -290,6 +290,7 @@
hpuinfo.user_channel_id as userChannelId,
hpuinfo.live_area as liveArea,
hpuinfo.want_shop_area as wantShopArea,
hpuinfo.ec_want_shop_area as ecWantShopArea,
hpuinfo.accept_adjust_type as acceptAdjustType,
cr.create_time as lastFollowTime,
cr.call_status as callStatus

2
coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
View File

@@ -474,6 +474,7 @@
b.user_channel_id as userChannelId,
b.username as userName,
b.want_shop_area as wantShopArea,
b.ec_want_shop_area as EcWantShopArea,
b.accept_adjust_type as acceptAdjustType,
bi.user_portrait as userPortrait,
hpl.phone_address as phoneAddress
@@ -520,6 +521,7 @@
hpli.update_time as updateTime,
hpuinfo.user_channel_id as userChannelId,
hpuinfo.want_shop_area as wantShopArea,
hpuinfo.ec_want_shop_area as ecWantShopArea,
hpuinfo.accept_adjust_type as acceptAdjustType,
hpuinfo.username as partnerUserName,
hpuinfo.mobile as partnerUserPhone,

2
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerIntentApplyInfoDTO.java
View File

@@ -61,4 +61,6 @@ public class PartnerIntentApplyInfoDTO {
private String userPortrait;
private String ecWantShopArea;
}

2
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PrivateSeaLineDTO.java
View File

@@ -81,4 +81,6 @@ public class PrivateSeaLineDTO {
private String userPortrait;
private String ecWantShopArea;
}

2
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PublicSeaLineDTO.java
View File

@@ -24,6 +24,8 @@ public class PublicSeaLineDTO {
private String wantShopArea;
private String ecWantShopArea;
private String acceptAdjustType;
private Date updateTime;

4
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentApplyInfoVO.java
View File

@@ -50,6 +50,9 @@ public class PartnerIntentApplyInfoVO {
@ApiModelProperty("意向开店区域")
private String wantShopArea;
@ApiModelProperty("EC意向开店区域")
private String ecWantShopArea;
@ApiModelProperty("意向开店区域")
private String wantShopAreaName;
@@ -92,6 +95,7 @@ public class PartnerIntentApplyInfoVO {
partnerIntentApplyInfoVO.setAcceptAdjustType(partnerIntentApplyInfoDTO.getAcceptAdjustType());
partnerIntentApplyInfoVO.setLiveArea(partnerIntentApplyInfoDTO.getLiveArea());
partnerIntentApplyInfoVO.setWantShopArea(partnerIntentApplyInfoDTO.getWantShopArea());
partnerIntentApplyInfoVO.setEcWantShopArea(partnerIntentApplyInfoDTO.getEcWantShopArea());
String deadLine = DateUtil.format(partnerIntentApplyInfoDTO.getDeadline(), CoolDateUtils.DATE_FORMAT_SEC_2);
partnerIntentApplyInfoVO.setDeadline(deadLine);
partnerIntentApplyInfoVO.setPartnerUserName(partnerIntentApplyInfoDTO.getPartnerUserName());

4
coolstore-partner-model/src/main/java/com/cool/store/vo/PrivateSeaLineListVo.java
View File

@@ -66,6 +66,9 @@ public class PrivateSeaLineListVo {
@ApiModelProperty("意向开店区域名称")
private String wantShopAreaName;
@ApiModelProperty("EC意向开店区域")
private String ecWantShopArea;
@ApiModelProperty("0不接受调剂、1全国调剂、2省内调剂、3市内调剂")
private Integer acceptAdjustType;
@@ -126,6 +129,7 @@ public class PrivateSeaLineListVo {
privateSeaLineListVo.setUpdateTime(updateTime);
privateSeaLineListVo.setRecommendPartnerId(x.getRecommendPartnerId());
privateSeaLineListVo.setRecommendPartnerMobile(x.getRecommendPartnerId());
privateSeaLineListVo.setEcWantShopArea(x.getEcWantShopArea());
privateSeaLineListVo.setWantShopArea(x.getWantShopArea());
privateSeaLineListVo.setWantShopAreaName(wantShopAreaNameMap.get(x.getWantShopArea()));
privateSeaLineListVo.setInvestmentManager(x.getInvestmentManager());

5
coolstore-partner-model/src/main/java/com/cool/store/vo/PublicSeaLineListVo.java
View File

@@ -65,9 +65,12 @@ public class PublicSeaLineListVo {
@ApiModelProperty("意向开店区域ID")
private String wantShopArea;
@ApiModelProperty("意向开店区域ID")
@ApiModelProperty("意向开店区域名称")
private String wantShopAreaName;
@ApiModelProperty("EC意向开店区域")
private String ecWantShopArea;
private String acceptAdjustType;
private String updateTime;

1
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -595,6 +595,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
}
publicSeaLineListVo.setPhoneAddress(phoneAddress);
publicSeaLineListVo.setWantShopArea(x.getWantShopArea());
publicSeaLineListVo.setEcWantShopArea(x.getEcWantShopArea());
publicSeaLineListVo.setUpdateTime(DateUtil.format(x.getUpdateTime(),CoolDateUtils.DATE_FORMAT_SEC_2));
publicSeaLineListVo.setId(x.getLineId());
publicSeaLineListVo.setAcceptAdjustType(x.getAcceptAdjustType());