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

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());