Commit 257d00fb authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16

parents e1d86c59 8e0e23ae
......@@ -19,14 +19,8 @@ package com.yifu.cloud.plus.v1.yifu.archives.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yifu.cloud.plus.v1.yifu.archives.config.GzConfig;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TAttaInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmpContactInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzEmpInfo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TGzOfferInfo;
import com.yifu.cloud.plus.v1.yifu.archives.service.TAttaInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmpContactInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TGzEmpInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.service.TGzOfferInfoService;
import com.yifu.cloud.plus.v1.yifu.archives.entity.*;
import com.yifu.cloud.plus.v1.yifu.archives.service.*;
import com.yifu.cloud.plus.v1.yifu.archives.utils.GZSign;
import com.yifu.cloud.plus.v1.yifu.archives.utils.ReturnGz;
import com.yifu.cloud.plus.v1.yifu.archives.vo.*;
......@@ -72,6 +66,7 @@ public class TGzController {
private final TGzEmpInfoService tGzEmpInfoService;
private final TAttaInfoService tAttaInfoService;
private final TEmpContactInfoService tEmpContactInfoService;
private final LGuaziOfferRecordService lGuaziOfferRecordService;
private RestTemplate restTemplate = new RestTemplate();
......@@ -113,10 +108,22 @@ public class TGzController {
if (R.isSuccess(r)) {
return ReturnGz.ok();
} else {
saveFailLog(nowGzOfferInfo.getId(), user);
return ReturnGz.failed(r.getMsg());
}
}
private void saveFailLog(Integer offerId, YifuUser user) {
LGuaziOfferRecord recordLog = new LGuaziOfferRecord();
recordLog.setOfferId(offerId);
recordLog.setContent("Offer取消失败");
// 记录来源
recordLog.setRecordFrom("13");
recordLog.setCreateBy(user.getId());
recordLog.setCreateName(user.getNickname());
lGuaziOfferRecordService.save(recordLog);
}
/**
* @Description: 接收瓜子推送过来的Offer信息
* @Author: hgw
......
......@@ -31,9 +31,9 @@ public class MybatisPlusMetaObjectHandler implements MetaObjectHandler {
fillValIfNullByName("updateTime", now, metaObject, true);
YifuUser yifuUser = getYifuUser();
if (Common.isNotNull(yifuUser)){
fillValIfNullByName("createBy", yifuUser.getId(), metaObject, true);
fillValIfNullByName("updateBy", yifuUser.getId(), metaObject, true);
fillValIfNullByName("createName", yifuUser.getNickname(), metaObject, true);
fillValIfNullByName("createBy", yifuUser.getId(), metaObject, false);
fillValIfNullByName("updateBy", yifuUser.getId(), metaObject, false);
fillValIfNullByName("createName", yifuUser.getNickname(), metaObject, false);
}
}
......
......@@ -900,8 +900,4 @@ public class TDispatchInfo extends BaseEntity {
@Schema(description ="社保待购买id")
@TableField(exist = false)
private String preId;
@Schema(description ="社保待购买前端客服")
@TableField(exist = false)
private String preName;
}
......@@ -814,8 +814,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
auditInfo.setDispatchInfoId(dispatch.getId());
auditInfo.setAuditRemark("派单申请提交");
auditInfo.setTitle("派单申请");
auditInfo.setOrganName(dispatch.getOrganName());
auditInfo.setAuditUser(null != dispatch.getPreName() ? dispatch.getPreName() : dispatch.getCreateName());
auditInfo.setOrganName(null != dispatch.getPreId() ? "" : dispatch.getOrganName());
auditInfo.setAuditUser(dispatch.getCreateName());
auditInfo.setAuditTime(new Date());
auditInfo.setIsCommision(CommonConstants.ONE_STRING);
auditInfoMapper.insert(auditInfo);
......@@ -1359,10 +1359,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(excel.getPreId())) {
dispatch.setPreId(excel.getPreId());
}
if (Common.isNotNull(excel.getPreName())) {
dispatch.setPreName(excel.getPreName());
}
dispatch.setCreateBy(null == user ? "7" : user.getId());
dispatch.setCreateBy(null == user ? "1" : user.getId());
dispatch.setCreateName(Common.isNotNull(excel.getPreName()) ? excel.getPreName() : user.getNickname());
dispatch.setCreateTime(LocalDateTime.now());
dispatch.setContractSubName(excel.getContractSubName());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment