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

Merge remote-tracking branch 'origin/master' into dev/feat/partner1.6_20231226

Browse Source
This commit is contained in:
feng.li
2024-01-02 16:37:31 +08:00
parent 2e2dd6b065 5109be349c
commit f29bef2bf7
6 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -844,7 +844,7 @@
<select id="getPrivateSeaPageInfoNext" resultType="com.cool.store.vo.LinePageInfoVo">
SELECT
hpli.id as lineId,
hpli.partner_id as partnerId
hpli.partner_id as partnerId,hpli.development_manager AS developmentManager
FROM
hy_partner_line_info hpli
LEFT JOIN hy_partner_intent_info hpii ON hpli.id = hpii.partner_line_id

12
coolstore-partner-model/src/main/java/com/cool/store/request/CreateQualifyVerifyReq.java
View File

@@ -2,13 +2,10 @@ package com.cool.store.request;
import com.cool.store.request.data.flow.IdName;
import com.cool.store.request.data.flow.KeyText;
import com.cool.store.request.data.flow.SkrRelshipProve;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author: young.yu
* @Date: 2023-06-14 14:18
@@ -38,6 +35,15 @@ public class CreateQualifyVerifyReq {
@ApiModelProperty(value = "加盟商类型", required = true)
private KeyText fraType;
@ApiModelProperty(value = "是否是新加盟商", example = "YES")
private KeyText whetherNewFranchisee;
@ApiModelProperty(value = "是否需要设备分期", example = "yes")
private KeyText needEquipmentInstallment;
@ApiModelProperty(value = "加盟费支付方式 分期支付 yes；全款支付 no", example = "yes")
private KeyText fraFeePayMethod;
@ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {HSAY: 沪上阿姨} 2: {HSLIGHT: 沪上阿姨（轻享）}")
private KeyText innerbrandtype;

11
coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.request;
import com.cool.store.request.data.flow.IdName;
import com.cool.store.request.data.flow.KeyText;
import com.cool.store.request.data.flow.SkrRelshipProve;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -61,6 +62,16 @@ public class RpcCreateQualifyVerifyReq {
@ApiModelProperty(value = "加盟商类型", required = true)
private KeyText fraType;
@ApiModelProperty(value = "是否是新加盟商", example = "YES")
@JsonProperty("IsNewFranchisee")
private KeyText IsNewFranchisee;
@ApiModelProperty(value = "是否需要设备分期", example = "yes")
private KeyText needEquipmentInstallment;
@ApiModelProperty(value = "加盟费支付方式 分期支付 yes；全款支付 no", example = "yes")
private KeyText fraFeePayMethod;
@ApiModelProperty(value = "加盟类型", required = true, allowableValues = "1: {HSAY: 沪上阿姨} 2: {HSLIGHT: 沪上阿姨（轻享）}")
private KeyText innerbrandtype;

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java
View File

@@ -181,13 +181,15 @@ public class EcSyncServiceImpl implements EcSyncService {
@Override
public Integer historyLineTrajectory(List<HyPartnerEcTrackLogDO> resultTrajectoryList) {
List<HyPartnerEcTrackLogDO> result=new ArrayList<>();
for (HyPartnerEcTrackLogDO hyPartnerEcTrackLogDO : resultTrajectoryList) {
HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(hyPartnerEcTrackLogDO.getMobile());
if (ObjectUtil.isNotNull(hyPartnerUserInfoDO)) {
hyPartnerEcTrackLogDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId());
result.add(hyPartnerEcTrackLogDO);
}
}
return mybatisBatchUtils.batchInsertOrUpdate(resultTrajectoryList, HyPartnerEcTrackLogMapper.class, (record, mapper) -> mapper.insertSelective(record));
return mybatisBatchUtils.batchInsertOrUpdate(result, HyPartnerEcTrackLogMapper.class, (record, mapper) -> mapper.insertSelective(record));
}
/**
@@ -434,7 +436,7 @@ public class EcSyncServiceImpl implements EcSyncService {
if (enterpriseUserDO==null) {
// 给飞书群发送消息 跟进人找不到
sendFeiShuRobotMessage("推送：飞书架构中找不到该用户：【" + followUserName + "】，该用户电话号码为：" + followUserMobile, "27243d49-97ca-4981-8aec-7c3bf84eb660");
throw new ApiException("飞书架构中找不到该用户：【" + followUserName + "】，该用户电话号码为：" + followUserMobile);
return "";
}
return enterpriseUserDO.getUserId();
}

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

@@ -130,6 +130,7 @@ public class FlowServiceImpl implements FlowService {
dataBody.setFraSource(request.getFraSource());
//copy properties
BeanUtil.copyProperties(request, dataBody);
dataBody.setIsNewFranchisee(request.getWhetherNewFranchisee());
//日期格式问题
if (request.getWantSignTime().endsWith("00:00:00")) {
dataBody.setIntendedSignDate(request.getWantSignTime());

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

@@ -2,7 +2,6 @@ package com.cool.store.controller;
import com.cool.store.exception.ApiException;
import com.cool.store.request.CreateQualifyVerifyReq;
import com.cool.store.request.FinishInterviewReq;
import com.cool.store.request.QualificationCallbackReq;
import com.cool.store.response.ResponseResult;
import com.cool.store.service.FlowService;
@@ -26,7 +25,6 @@ public class FlowController {
@Autowired
private FlowService flowService;
@PostMapping("/qualifyVerify/create")
@ApiOperation("发起加盟商资质审核")
public ResponseResult createQualifyVerify(@RequestBody CreateQualifyVerifyReq request) throws ApiException, IOException {