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

意向区域新增不限&新增字段&手机号校验

Browse Source
This commit is contained in:
苏竹红
2023-09-11 14:44:06 +08:00
parent 331da47300
commit 9c13abb092
13 changed files with 100 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -67,6 +67,7 @@ public enum ErrorCodeEnum {
NO_TRANSFER_REQUIRED(500013, "招商经理现有私海线索无需转让，请检查后重试！", null),
NO_BATCH_TRANSFER_REQUIRED(500014, "已选线索包含此招商经理现有私海线索，无需转让，请检查后重试!", null),
PARTNER_MOBILE_EXIST(500010, "手机号码已存在，请核实！", null),
MOBILE_EXIST(500015, "此手机号码已存在，请修改后重试", null),
INTERVIEW_ENTER_FAIL(1021101, "进入面试间失败", null),
DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null),

5
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java
View File

@@ -119,6 +119,11 @@ public class HyOpenAreaInfoDAO {
return hyOpenAreaInfoMapper.getAllOpenArea();
}
public List<HyOpenAreaInfoDO> selectAllCity(){
return hyOpenAreaInfoMapper.selectAllCity();
}
/**
* 过滤叶子节点
* @param openAreaIds

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java
View File

@@ -123,4 +123,6 @@ public interface HyOpenAreaInfoMapper {
List<HyOpenAreaInfoDO> getProvinceAllCode(@Param("id") String id);
HyOpenAreaInfoDO selectByAreaPath(@Param("areaPath") String areaPath);
List<HyOpenAreaInfoDO> selectAllCity();
}

7
coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
View File

@@ -310,4 +310,11 @@
WHERE area_path= concat('/',#{areaPath},'/') and deleted=0 and province_city_flag=0
</select>
<select id="selectAllCity" resultMap="BaseResultMap">
SELECT
<include refid="Base_Column_List"></include>
FROM `hy_open_area_info`
WHERE deleted=0 and province_city_flag = 1 and parent_id is not null
</select>
</mapper>

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

@@ -25,12 +25,14 @@
<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="detailed_address" jdbcType="VARCHAR" property="detailedAddress" />
<result column="email" jdbcType="VARCHAR" property="email" />
</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
create_time, update_time,detailed_address,email
</sql>
<select id="selectByPrimaryKeySelective" resultMap="BaseResultMap">
select
@@ -109,6 +111,15 @@
<if test="record.updateTime != null">
update_time,
</if>
<if test="record.otherBand != null">
other_band,
</if>
<if test="record.detailedAddress != null">
detailed_address,
</if>
<if test="record.email != null">
email,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="record.partnerId != null">
@@ -177,6 +188,12 @@
<if test="record.updateTime != null">
#{record.updateTime},
</if>
<if test="record.detailedAddress != null">
#{record.detailedAddress},
</if>
<if test="record.email != null">
#{record.email},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective">
@@ -248,6 +265,12 @@
<if test="record.updateTime != null">
update_time = #{record.updateTime},
</if>
<if test="record.detailedAddress != null">
detailed_address = #{record.detailedAddress},
</if>
<if test="record.email != null">
email = #{record.email},
</if>
</set>
where id = #{record.id}
</update>

6
coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerIntentInfoDO.java
View File

@@ -98,4 +98,10 @@ public class HyPartnerIntentInfoDO implements Serializable {
@ApiModelProperty("通过证明")
private String passCertifyFile;
@ApiModelProperty("详细地址")
private String detailedAddress;
@ApiModelProperty("邮箱地址")
private String email;
}

6
coolstore-partner-model/src/main/java/com/cool/store/request/PartnerIntentInfoRequest.java
View File

@@ -27,6 +27,12 @@ public class PartnerIntentInfoRequest {
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("详细地址")
private String detailedAddress;
@ApiModelProperty("邮箱地址")
private String email;
@ApiModelProperty("意向开店区域")
private String wantShopArea;

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

@@ -39,6 +39,9 @@ public class PartnerIntentInfoVO {
@ApiModelProperty("常驻区域")
private String liveArea;
@ApiModelProperty("详细地址")
private String detailedAddress;
@ApiModelProperty("意向开店区域")
private String wantShopArea;

7
coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java
View File

@@ -64,5 +64,12 @@ public interface OpenAreaService {
*/
OpenProvinceVO getOpenProvince();
/**
* V1.4
* 意向区域添加不限
* 每个市下面添加一个不限
*/
Boolean addOpenArea();
}

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

@@ -185,6 +185,7 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
partnerIntentInfoVO.setPartnerUserName(hyPartnerUserInfoDO.getUsername());
partnerIntentInfoVO.setWorkflowStage(hyPartnerLineInfoDO.getWorkflowStage());
partnerIntentInfoVO.setWorkflowStatus(hyPartnerLineInfoDO.getWorkflowStatus());
partnerIntentInfoVO.setDetailedAddress(hyPartnerIntentInfoDO.getDetailedAddress());
partnerIntentInfoVO.setPartnerUserPhone(hyPartnerUserInfoDO.getMobile());
HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()));
partnerIntentInfoVO.setWantShopAreaName(hyOpenAreaInfoDO.getAreaPath().replace("/"," "));
@@ -442,6 +443,8 @@ public class HyPartnerIntentInfoServiceImpl implements HyPartnerIntentInfoServic
intentInfoDO.setPartnerLineId(request.getPartnerLineId());
intentInfoDO.setLiveArea(request.getLiveArea());
intentInfoDO.setWantShopArea(request.getWantShopArea());
intentInfoDO.setDetailedAddress(request.getDetailedAddress());
intentInfoDO.setEmail(request.getEmail());
intentInfoDO.setAcceptAdjustType(request.getAcceptAdjustType());
intentInfoDO.setIsHaveWantShop(request.getIsHaveWantShop());
intentInfoDO.setWantShopInfo("");

25
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java
View File

@@ -6,6 +6,7 @@ import com.cool.store.constants.CommonConstants;
import com.cool.store.dao.HyOpenAreaInfoDAO;
import com.cool.store.dto.partner.ApplyReservationProvinceDTO;
import com.cool.store.entity.HyOpenAreaInfoDO;
import com.cool.store.mapper.HyOpenAreaInfoMapper;
import com.cool.store.request.OpenAreaRequest;
import com.cool.store.service.OpenAreaService;
import com.cool.store.utils.RedisUtilPool;
@@ -36,6 +37,8 @@ public class OpenAreaServiceImpl implements OpenAreaService {
@Resource
private HyOpenAreaInfoDAO hyOpenAreaInfoDAO;
@Resource
private HyOpenAreaInfoMapper hyOpenAreaInfoMapper;
@Resource
private RedisUtilPool redisUtilPool;
@@ -190,6 +193,25 @@ public class OpenAreaServiceImpl implements OpenAreaService {
return openProvinceVO;
}
@Override
public Boolean addOpenArea() {
//查询出所有的市
List<HyOpenAreaInfoDO> openArea = hyOpenAreaInfoDAO.selectAllCity();
if (CollectionUtils.isNotEmpty(openArea)){
//在每个市下面添加名称为不限的区
openArea.forEach(x->{
Long id = x.getId();
HyOpenAreaInfoDO hyOpenAreaInfoDO = new HyOpenAreaInfoDO();
hyOpenAreaInfoDO.setAreaStatus("open");
hyOpenAreaInfoDO.setAreaName("不限");
hyOpenAreaInfoDO.setParentId(id);
hyOpenAreaInfoDO.setAreaPath(x.getAreaPath()+"不限/");
hyOpenAreaInfoMapper.insertSelective(hyOpenAreaInfoDO);
});
}
return true;
}
private OpenAreaVO convertDoToVo(HyOpenAreaInfoDO hyOpenAreaInfoDO){
OpenAreaVO openAreaVO = new OpenAreaVO();
openAreaVO.setId(hyOpenAreaInfoDO.getId());
@@ -259,6 +281,7 @@ public class OpenAreaServiceImpl implements OpenAreaService {
}
}
return jsonArray;
}
}

7
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java
View File

@@ -104,6 +104,13 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService {
UserInfoUpdateDTO.UserInfoUpdate beforeUserinfoUpdate = new UserInfoUpdateDTO.UserInfoUpdate(hyPartnerUserInfoDO.getUsername(), hyPartnerUserInfoDO.getMobile(), hyPartnerUserInfoDO.getLiveArea(), hyPartnerUserInfoDO.getWantShopArea(), hyPartnerUserInfoDO.getAcceptAdjustType());
UserInfoUpdateDTO.UserInfoUpdate afterUserinfoUpdate = new UserInfoUpdateDTO.UserInfoUpdate(partnerUserInfoRequest.getUsername(), partnerUserInfoRequest.getMobile(), partnerUserInfoRequest.getLiveArea(), partnerUserInfoRequest.getWantShopArea(), partnerUserInfoRequest.getAcceptAdjustType());
//如果手机号不相同 校验手机号
if (StringUtils.isNotEmpty(hyPartnerUserInfoDO.getMobile()) && !hyPartnerUserInfoDO.getMobile().equals(partnerUserInfoRequest.getMobile())){
HyPartnerUserInfoDO userInfo = hyPartnerUserInfoDAO.selectByMobile(partnerUserInfoRequest.getMobile());
if (userInfo != null){
throw new ServiceException(ErrorCodeEnum.MOBILE_EXIST);
}
}
ApplyBaseInfoVO applyBaseInfoVO = new ApplyBaseInfoVO();
fillUserInfoDOByRequest(hyPartnerUserInfoDO, partnerUserInfoRequest);
hyPartnerUserInfoDAO.updateByPrimaryKeySelective(hyPartnerUserInfoDO);

5
coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java
View File

@@ -280,4 +280,9 @@ public class TestController {
followTaskService.followTaskAnHourAgoRemind();
return ResponseResult.success();
}
@GetMapping("/initOpenArea")
public ResponseResult initOpenArea() {
return ResponseResult.success(openAreaService.addOpenArea());
}
}