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

Merge branch 'cc_20230520_partner' of http://gitlab.coolcollege.cn/hangzhou/java/coolstore-partner-manage into cc_20230520_partner

Browse Source
This commit is contained in:
wxp01309236
2023-06-19 10:23:43 +08:00
parent 9b65b37b25 084274e0d5
commit d5b1941f2d
9 changed files with 56 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,16 +25,12 @@
<result column="weakness" jdbcType="VARCHAR" property="weakness" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="pass_cause" jdbcType="VARCHAR" property="passCause" />
<result column="pass_time" jdbcType="TIMESTAMP" property="passTime" />
<result column="pass_user" jdbcType="VARCHAR" property="passUser" />
<result column="pass_certify-file" jdbcType="VARCHAR" property="passCertifyFile" />
</resultMap>
<sql id="Base_Column_List">
id, partner_id, partner_line_id, live_area, want_shop_area, accept_adjust_type, is_have_want_shop,
want_shop_info, max_budget, money_source, money_prove, education, work_year, is_have_work_exp,
work_exp, is_consumer, other_band, brand_strength, need_improve, strength, weakness,
create_time, update_time,pass_cause,pass_time,pass_user,pass_certify-file
create_time, update_time
</sql>
<select id="selectByPrimaryKeySelective" resultMap="BaseResultMap">
select

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

@@ -297,7 +297,11 @@
a.partner_id as partnerUserId,
a.investment_manager as investmentManager,
b.user_portrait as user_portrait,
b.id as partnerBaseInfoId
b.id as partnerBaseInfoId,
b.pass_reason as passReason,
b.certify_file as certifyFile,
b.pass_time as passTime,
b.pass_user_id as passUserId
from hy_partner_line_info a inner join hy_partner_base_info b
on a.id = b.partner_line_id
<where>

18
coolstore-partner-model/src/main/java/com/cool/store/dto/partner/PartnerLineInfoAndBaseInfoDTO.java
View File

@@ -3,6 +3,8 @@ package com.cool.store.dto.partner;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Author suzhuhong
* @Date 2023/6/12 16:05
@@ -43,5 +45,21 @@ public class PartnerLineInfoAndBaseInfoDTO {
@ApiModelProperty("招商经理手机号")
private String investmentManagerPhone;
@ApiModelProperty("用户画像")
private String userPortrait;
@ApiModelProperty("通过原因")
private String passCause;
@ApiModelProperty("通过时间")
private Date passTime;
@ApiModelProperty("通过人名称")
private String passUserName;
@ApiModelProperty("通过人ID")
private String passUserId;
@ApiModelProperty("通过证明")
private String passCertifyFile;
}

14
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerIntentInfoVO.java
View File

@@ -88,19 +88,5 @@ public class PartnerIntentInfoVO {
@ApiModelProperty("创建时间")
private Date createTime;
@ApiModelProperty("通过原因")
private String passCause;
@ApiModelProperty("通过时间")
private Date passTime;
@ApiModelProperty("通过人名称")
private String passUserName;
@ApiModelProperty("通过人ID")
private String passUserId;
@ApiModelProperty("通过证明")
private String passCertifyFile;
}

18
coolstore-partner-model/src/main/java/com/cool/store/vo/PartnerLineInfoAndBaseInfoVO.java
View File

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@@ -46,8 +47,25 @@ public class PartnerLineInfoAndBaseInfoVO {
@ApiModelProperty("招商经理手机号")
private String investmentManagerPhone;
@ApiModelProperty("用户画像")
private String userPortrait;
@ApiModelProperty("线索状态")
private Integer lineStatus;
@ApiModelProperty("通过原因")
private String passCause;
@ApiModelProperty("通过时间")
private Date passTime;
@ApiModelProperty("通过人名称")
private String passUserName;
@ApiModelProperty("通过人ID")
private String passUserId;
@ApiModelProperty("通过证明")
private List<String> passCertifyFile;
}

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerIntentInfoServiceImpl.java
View File

@@ -108,10 +108,6 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerIntentInfoDO.getPartnerId());
partnerIntentInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
partnerIntentInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile());
EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(hyPartnerIntentInfoDO.getPassUser());
if (userInfo!=null){
partnerIntentInfoVO.setPassUserName(userInfo.getName());
}
//todo su 手机号归属地 意向申请区域名称
return partnerIntentInfoVO;
}
@@ -214,10 +210,6 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
partnerIntentInfoVO.setOtherBand(hyPartnerIntentInfoDO.getOtherBand());
partnerIntentInfoVO.setStrength(hyPartnerIntentInfoDO.getStrength());
partnerIntentInfoVO.setNeedImprove(hyPartnerIntentInfoDO.getNeedImprove());
partnerIntentInfoVO.setPassCause(hyPartnerIntentInfoDO.getPassCause());
partnerIntentInfoVO.setPassCertifyFile(hyPartnerIntentInfoDO.getPassCertifyFile());
partnerIntentInfoVO.setPassUserId(hyPartnerIntentInfoDO.getPassUser());
partnerIntentInfoVO.setPassTime(hyPartnerIntentInfoDO.getPassTime());
return partnerIntentInfoVO;
}

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

@@ -80,6 +80,10 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
partnerLineInfoAndBaseInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
partnerLineInfoAndBaseInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile());
}
EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(partnerLineInfoAndBaseInfoDTO.getPassUserId());
if (userInfo!=null){
partnerLineInfoAndBaseInfoVO.setPassUserName(userInfo.getName());
}
//todo su 1、招商经理名称 手机号归属地 2、加盟商手机号归属地
return partnerLineInfoAndBaseInfoVO;
}
@@ -362,6 +366,12 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
partnerLineInfoAndBaseInfoVO.setPartnerBaseInfoId(partnerLineInfoAndBaseInfoDTO.getPartnerBaseInfoId());
partnerLineInfoAndBaseInfoVO.setWorkflowStage(partnerLineInfoAndBaseInfoDTO.getWorkflowStage());
partnerLineInfoAndBaseInfoVO.setWorkflowStatus(partnerLineInfoAndBaseInfoDTO.getWorkflowStatus());
partnerLineInfoAndBaseInfoVO.setPassCause(partnerLineInfoAndBaseInfoDTO.getPassCause());
if (StringUtil.isNotEmpty(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile())){
partnerLineInfoAndBaseInfoVO.setPassCertifyFile(JSONObject.parseArray(partnerLineInfoAndBaseInfoDTO.getPassCertifyFile(), String.class));
}
partnerLineInfoAndBaseInfoVO.setPassUserId(partnerLineInfoAndBaseInfoDTO.getPassUserId());
partnerLineInfoAndBaseInfoVO.setPassTime(partnerLineInfoAndBaseInfoDTO.getPassTime());
return partnerLineInfoAndBaseInfoVO;
}

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/ClerkController.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.controller;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.HyPartnerClerkService;
import com.cool.store.vo.PartnerClerkVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -21,6 +22,7 @@ import java.util.List;
*/
@RestController
@Slf4j
@Api(tags = "店员")
public class ClerkController {
@Resource

2
coolstore-partner-webb/src/main/java/com/cool/store/controller/ZoneController.java
View File

@@ -7,6 +7,7 @@ import com.cool.store.service.ZoneService;
import com.cool.store.vo.ZoneCheckVO;
import com.cool.store.vo.ZoneVO;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -23,6 +24,7 @@ import java.util.List;
*/
@RestController
@Slf4j
@Api(tags = "战区")
public class ZoneController {
@Resource