Skip to content

G
gic-store
Commit 1580a9fb by zhiwj
Options

ETL导购优化

parent 78df3845
Showing with 90 additions and 68 deletions
gic-store-service/src/main/java/com/gic/store/service/impl/ClerkLogServiceImpl.java
......@@ -12,6 +12,8 @@ import com.gic.store.service.ClerkLogService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -26,65 +28,77 @@ import java.util.Date;
@Service
public class ClerkLogServiceImpl implements ClerkLogService {
private Logger logger = LogManager.getLogger(ClerkLogServiceImpl.class);
@Autowired
private TabClerkLogMapper tabClerkLogMapper;
@Override
public Integer saveClerkLogBySaveClerk(Integer enterpriseId, Integer clerkId, Integer reason, String remark, Integer operatorId, String operatorName) {
TabClerkLog clerkLog = new TabClerkLog();
clerkLog.setEnterpriseId(enterpriseId);
clerkLog.setClerkId(clerkId);
clerkLog.setContent("导购新增");
clerkLog.setReason(reason);
clerkLog.setLogType(ClerkLogTypeEnum.SAVE.getCode());
clerkLog.setRemark(remark);
clerkLog.setCreateTime(new Date());
clerkLog.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
clerkLog.setOperatorId(operatorId);
clerkLog.setOperatorName(operatorName);
return tabClerkLogMapper.insertSelective(clerkLog);
try {
TabClerkLog clerkLog = new TabClerkLog();
clerkLog.setEnterpriseId(enterpriseId);
clerkLog.setClerkId(clerkId);
clerkLog.setContent("导购新增");
clerkLog.setReason(reason);
clerkLog.setLogType(ClerkLogTypeEnum.SAVE.getCode());
clerkLog.setRemark(remark);
clerkLog.setCreateTime(new Date());
clerkLog.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
clerkLog.setOperatorId(operatorId);
clerkLog.setOperatorName(operatorName);
return tabClerkLogMapper.insertSelective(clerkLog);
} catch (Exception e) {
logger.warn("保存导购日志出错", e);
}
return 0;
}
@Override
public Integer saveClerkLogByUpdateClerk(TabClerk oldClerk, ClerkDTO newClerk, Integer enterpriseId, Integer clerkId, Integer reason, String remark, Integer operatorId, String operatorName) {
TabClerkLog clerkLog = new TabClerkLog();
clerkLog.setEnterpriseId(enterpriseId);
clerkLog.setClerkId(clerkId);
clerkLog.setReason(reason);
clerkLog.setLogType(ClerkLogTypeEnum.UPDATE.getCode());
clerkLog.setRemark(remark);
clerkLog.setCreateTime(new Date());
clerkLog.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
clerkLog.setOperatorId(operatorId);
clerkLog.setOperatorName(operatorName);
try {
TabClerkLog clerkLog = new TabClerkLog();
clerkLog.setEnterpriseId(enterpriseId);
clerkLog.setClerkId(clerkId);
clerkLog.setReason(reason);
clerkLog.setLogType(ClerkLogTypeEnum.UPDATE.getCode());
clerkLog.setRemark(remark);
clerkLog.setCreateTime(new Date());
clerkLog.setStatus(GlobalInfo.DATA_STATUS_NORMAL);
clerkLog.setOperatorId(operatorId);
clerkLog.setOperatorName(operatorName);
StringBuilder sb = new StringBuilder();
if (StringUtils.isNotBlank(newClerk.getClerkName()) && !StringUtils.equals(newClerk.getClerkName(), oldClerk.getClerkName())) {
sb.append("导购名称").append("【").append(oldClerk.getClerkName()).append("】")
.append("变更为【").append(newClerk.getClerkName()).append("】");
}
if (newClerk.getClerkGender() != null && !newClerk.getClerkGender().equals(oldClerk.getClerkGender())) {
sb.append("性别").append("【").append(ClerkGenderEnum.parseCode(oldClerk.getClerkGender())).append("】")
.append("变更为【").append(ClerkGenderEnum.parseCode(newClerk.getClerkGender())).append("】");
}
if (StringUtils.isNotBlank(newClerk.getNationcode()) && !StringUtils.equals(newClerk.getNationcode(), oldClerk.getNationcode())) {
sb.append("区号").append("【").append(oldClerk.getNationcode()).append("】")
.append("变更为【").append(newClerk.getNationcode()).append("】");
}
if (StringUtils.isNotBlank(newClerk.getPhoneNumber()) && !StringUtils.equals(newClerk.getPhoneNumber(), oldClerk.getPhoneNumber())) {
sb.append("手机号").append("【").append(oldClerk.getPhoneNumber()).append("】")
.append("变更为【").append(newClerk.getPhoneNumber()).append("】");
}
if (StringUtils.isNotBlank(newClerk.getPositionName()) && !StringUtils.equals(newClerk.getPositionName(), oldClerk.getPositionName())) {
sb.append("职位").append("【").append(oldClerk.getPositionName()).append("】")
.append("变更为【").append(newClerk.getPositionName()).append("】");
}
clerkLog.setContent(sb.toString());
if (StringUtils.isNotBlank(clerkLog.getContent().trim())) {
return tabClerkLogMapper.insertSelective(clerkLog);
} else {
return 0;
StringBuilder sb = new StringBuilder();
if (StringUtils.isNotBlank(newClerk.getClerkName()) && !StringUtils.equals(newClerk.getClerkName(), oldClerk.getClerkName())) {
sb.append("导购名称").append("【").append(oldClerk.getClerkName()).append("】")
.append("变更为【").append(newClerk.getClerkName()).append("】");
}
if (newClerk.getClerkGender() != null && !newClerk.getClerkGender().equals(oldClerk.getClerkGender())) {
sb.append("性别").append("【").append(ClerkGenderEnum.parseCode(oldClerk.getClerkGender())).append("】")
.append("变更为【").append(ClerkGenderEnum.parseCode(newClerk.getClerkGender())).append("】");
}
if (StringUtils.isNotBlank(newClerk.getNationcode()) && !StringUtils.equals(newClerk.getNationcode(), oldClerk.getNationcode())) {
sb.append("区号").append("【").append(oldClerk.getNationcode()).append("】")
.append("变更为【").append(newClerk.getNationcode()).append("】");
}
if (StringUtils.isNotBlank(newClerk.getPhoneNumber()) && !StringUtils.equals(newClerk.getPhoneNumber(), oldClerk.getPhoneNumber())) {
sb.append("手机号").append("【").append(oldClerk.getPhoneNumber()).append("】")
.append("变更为【").append(newClerk.getPhoneNumber()).append("】");
}
if (StringUtils.isNotBlank(newClerk.getPositionName()) && !StringUtils.equals(newClerk.getPositionName(), oldClerk.getPositionName())) {
sb.append("职位").append("【").append(oldClerk.getPositionName()).append("】")
.append("变更为【").append(newClerk.getPositionName()).append("】");
}
clerkLog.setContent(sb.toString());
if (StringUtils.isNotBlank(clerkLog.getContent().trim())) {
return tabClerkLogMapper.insertSelective(clerkLog);
} else {
return 0;
}
} catch (Exception e) {
logger.warn("保存导购日志出错", e);
}
return 0;
}
@Override
......
gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java
......@@ -247,19 +247,23 @@ public class ClerkApiServiceImpl implements ClerkApiService {
}
private void storeLogByAddClerk(ClerkDTO clerkDTO) {
StoreLogDTO storeLogDTO = new StoreLogDTO();
storeLogDTO.setEnterpriseId(clerkDTO.getEnterpriseId());
Integer storeId = this.storeService.getStoreIdByStoreInfoId(clerkDTO.getEnterpriseId(),
clerkDTO.getStoreInfoId());
storeLogDTO.setStoreId(storeId);
storeLogDTO.setContent("门店关联导购【导购编码" + clerkDTO.getClerkCode() + "】");
storeLogDTO.setReason(clerkDTO.getReason());
storeLogDTO.setLogType(StoreLogTypeEnum.ADD_CLERK.getCode());
storeLogDTO.setRemark(clerkDTO.getRemark());
storeLogDTO.setOperatorId(clerkDTO.getOperatorId());
storeLogDTO.setOperatorName(clerkDTO.getOperatorName());
storeLogService.saveStoreLog(storeLogDTO);
try {
StoreLogDTO storeLogDTO = new StoreLogDTO();
storeLogDTO.setEnterpriseId(clerkDTO.getEnterpriseId());
Integer storeId = this.storeService.getStoreIdByStoreInfoId(clerkDTO.getEnterpriseId(),
clerkDTO.getStoreInfoId());
storeLogDTO.setStoreId(storeId);
storeLogDTO.setContent("门店关联导购【导购编码" + clerkDTO.getClerkCode() + "】");
storeLogDTO.setReason(clerkDTO.getReason());
storeLogDTO.setLogType(StoreLogTypeEnum.ADD_CLERK.getCode());
storeLogDTO.setRemark(clerkDTO.getRemark());
storeLogDTO.setOperatorId(clerkDTO.getOperatorId());
storeLogDTO.setOperatorName(clerkDTO.getOperatorName());
storeLogService.saveStoreLog(storeLogDTO);
} catch (Exception e) {
logger.warn("保存导购日志出错", e);
}
}
private boolean validStoreIsOther(Integer enterpriseId, Integer storeInfoId) {
......@@ -511,14 +515,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
if (StringUtils.isBlank(clerkCode)) {
return responseErrorElement(ImportClerkBatchResultEnum.C1);
}
TabClerk clerk = this.clerkService.getClerkByCode(enterpriseId, clerkCode, storeInfoId);
boolean isAdd = true;
//如果代购code存在，则进行更新操作
if (clerk != null) {
//return responseErrorElement(ImportClerkBatchResultEnum.C2);
isAdd = false;
}
if (StringUtils.isBlank(clerkInfo.getClerkName())) {
return responseErrorElement(ImportClerkBatchResultEnum.C3);
}
......@@ -541,6 +538,17 @@ public class ClerkApiServiceImpl implements ClerkApiService {
return responseErrorElement(ImportClerkBatchResultEnum.D3);
}
ClerkDTO clerkDTO = EntityUtil.changeEntityNew(ClerkDTO.class, clerkInfo);
TabClerk clerk = this.clerkService.getClerkByCode(enterpriseId, clerkCode, storeInfoId);
boolean isAdd = true;
//如果代购code存在，则进行更新操作
if (clerk != null) {
clerkDTO.setClerkId(clerk.getClerkId());
//return responseErrorElement(ImportClerkBatchResultEnum.C2);
isAdd = false;
}
clerkDTO.setStoreInfoId(storeInfoId);
clerkDTO.setStoreName(storeDTO.getStoreName());
......
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