diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoStoreRecord.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoStoreRecord.java index 5750aea..cdeabf1 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoStoreRecord.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoStoreRecord.java @@ -38,6 +38,12 @@ public class WrkInfoStoreRecord extends BaseEntity { @TableField(value = "store_no") private String storeNo; + /** + * 商户id + */ + @TableField(value = "store_id") + private Long storeId; + /** * 商户名称 */ @@ -110,11 +116,6 @@ public class WrkInfoStoreRecord extends BaseEntity { @TableField(value = "ins_fre") private Integer insFre; - /** - * 客户经理 - */ - @TableField(value = "account_manager") - private String accountManager; /** * 经理电话 diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalRecord.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalRecord.java index fa78a42..6c83236 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalRecord.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/po/WrkInfoTerminalRecord.java @@ -38,17 +38,9 @@ public class WrkInfoTerminalRecord extends BaseEntity { @TableField(value = "terminal_id") private Long terminalId; - /** - * 所属商户id - */ - @TableField(value = "store_id") - private Long storeId; - /** - * 所属商户编号 - */ - @TableField(value = "store_no") - private String storeNo; + + /** * 终端sn号 diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/DispatchQuery.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/DispatchQuery.java index 5ab7f74..c7f36e4 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/DispatchQuery.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/work/query/DispatchQuery.java @@ -37,7 +37,7 @@ public class DispatchQuery extends CommonParam { private Long userId; /** 工单类型 */ - @NotNull(message = "必须指定工单类型") +// @NotNull(message = "必须指定工单类型") @Range(min = 1, max = 50, message = "工单类型非法") private Integer workType; diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreImportServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreImportServiceImpl.java index 05f1b58..70bcb97 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreImportServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/terminal/service/impl/StoreImportServiceImpl.java @@ -4,11 +4,15 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.db.DaoTemplate; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chushang.common.core.constant.SecurityConstants; import com.chushang.common.core.util.StringUtils; +import com.chushang.common.core.web.Result; +import com.chushang.common.dict.feign.RemoteDictDataService; import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.common.mybatis.utils.WrapperUtils; @@ -44,8 +48,14 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @auther: zhao @@ -69,6 +79,10 @@ public class StoreImportServiceImpl extends ServiceImpl queryWrapper = WrapperUtils.builder(query, commonParam); @@ -80,33 +94,88 @@ public class StoreImportServiceImpl extends ServiceImpl data){ + // 通过任务名称查询任务 + List list = pollingTaskService.list(new LambdaQueryWrapper().eq(PollingTask::getName, storeImportDTO.getTaskName())); + if (CollectionUtil.isEmpty(list)){ + throw new RuntimeException("任务名称不存在"); + } + PollingTask topTask = pollingTaskService.getTopTask(list.get(0).getId()); + Store store = new Store(); + store.setAccountManager(storeImportDTO.getAccountManager()); + store.setDelState(true); + store.setAccountPhone(storeImportDTO.getAccountPhone()); + store.setLegalName(storeImportDTO.getLegalName()); + store.setSpecialNum(storeImportDTO.getSpecialNum()); + store.setShopName(storeImportDTO.getShopName()); + store.setProducts(storeImportDTO.getProducts()); + store.setTipTool(storeImportDTO.getTipTool()); + LocalDateTime registerTime = LocalDateTime.now(); + + Integer insFre = 0; + try{ + insFre = Integer.valueOf(storeImportDTO.getInsFre()); + }catch (Exception e){ + insFre = -1; + } + + try{ + LocalDate registerDate = storeImportDTO.getRegisterTime(); + registerTime = LocalDateTime.of(registerDate, LocalTime.MIDNIGHT); + }catch (Exception e){ + registerTime = LocalDateTime.now(); + } + store.setInsFre(insFre); + store.setStoreNo(storeImportDTO.getStoreNo()); + store.setStoreName(storeImportDTO.getStoreName()); + store.setStoreAddress(storeImportDTO.getStoreAddress()); + store.setStoreContact(storeImportDTO.getStoreContact()); + store.setStorePhone(storeImportDTO.getStorePhone()); + store.setStoreType(1); + store.setRegisterTime(registerTime); // registertime + store.setTaskId(topTask.getId()); + store.setDeptId(SecurityUtils.getDeptId()); + store.setLowerTaskId(list.get(0).getId()); + store.setStoreId(IdUtil.getSnowflake().nextId()); + return store; + } + @Override @Transactional(rollbackFor = Exception.class) public int confimImport(List lists) { int i = 0; + Result> storeType = remoteDictDataService.getInfo("store_type", SecurityConstants.INNER); + Map data = new HashMap<>(); + //todo 将返回的map一一对应 + if(storeType.isSuccess()){ + data = storeType.getData(); + } + // 商户类型枚举 for (StoreImportDTO storeImportDTO : lists) { i++; if (StringUtils.isBlank(storeImportDTO.getTaskName())) { throw new RuntimeException("任务名称不能为空"); } - // 通过任务名称查询任务 - List list = pollingTaskService.list(new LambdaQueryWrapper().eq(PollingTask::getName, storeImportDTO.getTaskName())); - if (CollectionUtil.isEmpty(list)){ - throw new RuntimeException("任务名称不存在"); - } - PollingTask topTask = pollingTaskService.getTopTask(list.get(0).getId()); - StoreImport storeImport = BeanCopyUtils.copy(storeImportDTO, StoreImport.class); - Store store = BeanCopyUtils.copy(storeImport, Store.class); - store.setTaskId(topTask.getId()); - store.setDeptId(SecurityUtils.getDeptId()); - store.setLowerTaskId(list.get(0).getId()); - store.setStoreId(IdUtil.getSnowflake().nextId()); + Store store = genStoreEntity(storeImportDTO,data); storeMapper.insert(store); - Terminal terminal = BeanCopyUtils.copy(storeImport, Terminal.class); + Terminal terminal = new Terminal(); + terminal.setTerminalNo(storeImportDTO.getTerminalNo()); + terminal.setTerminalSn(storeImportDTO.getTerminalSn()); + terminal.setTerminalModel(storeImportDTO.getTerminalModel()); + terminal.setTerminalType(1);//storeImportDTO.getTerminalType() + terminal.setTerminalVersion(storeImportDTO.getTerminalVersion()); + terminal.setTerminalSource(1);//storeImportDTO.getTerminalSource() + terminal.setTerminalAddress(storeImportDTO.getTerminalAddress()); + terminal.setOccupy(0); + terminal.setTerminalStatus(1); terminal.setStoreId(store.getStoreId()); + terminal.setLowerTaskId(store.getLowerTaskId()); + terminal.setTaskId(store.getTaskId()); + terminal.setDeptId(SecurityUtils.getDeptId()); terminalMapper.insert(terminal); - TerminalIns terminalIns = BeanCopyUtils.copy(storeImport, TerminalIns.class); + TerminalIns terminalIns = new TerminalIns();//BeanCopyUtils.copy(storeImport, TerminalIns.class); terminalIns.setTerminalId(terminal.getTerminalId()); terminalIns.setStoreId(store.getStoreId()); terminalInsMapper.insert(terminalIns); diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java index faaa4eb..958a87f 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/service/impl/WrkInfoServiceImpl.java @@ -534,6 +534,7 @@ public class WrkInfoServiceImpl extends ServiceImpl impl private WrkInfo makeWrkInfoEntity(DispatchDTO dispatch, DispatchQuery query, Long userId, String userName, Integer workMethod) { WrkInfo wrkInfo = new WrkInfo(); wrkInfo.setTaskId(query.getTaskId()); + wrkInfo.setDeptId(SecurityUtils.getDeptId()); wrkInfo.setUserId(userId); wrkInfo.setAccountPhone(dispatch.getAccountPhone()); wrkInfo.setUserName(userName); @@ -543,6 +544,8 @@ public class WrkInfoServiceImpl extends ServiceImpl impl wrkInfo.setWorkSort(query.getWorkSort()); wrkInfo.setWrkStatus(1); wrkInfo.setWorkSource(query.getWorkSource()); + wrkInfo.setTaskId(dispatch.getTaskId()); + wrkInfo.setLowerTaskId(dispatch.getLowerTaskId()); // 处理时间 //wrkInfo.setDisposeTime(query.getEndTime()); // 业务员名字和客户经理? @@ -558,7 +561,7 @@ public class WrkInfoServiceImpl extends ServiceImpl impl if (result.isSuccess()) { Map userIds = result.getData(); for (DispatchDTO dispatchDTO : dispatch) { - Long userId = userIds.get(dispatchDTO.getAccountManager()); + Long userId = 1L;// 先固定 userIds.get(dispatchDTO.getAccountManager()); Assert.notNull(userId, "【{}】未设置商户", dispatchDTO.getAccountManager()); // 组装wrkinfo实体 WrkInfo wrkInfo = makeWrkInfoEntity(dispatchDTO, query, userId, dispatchDTO.getAccountManager(), 0); @@ -569,6 +572,7 @@ public class WrkInfoServiceImpl extends ServiceImpl impl wrkInfoTerminalRecordService.save(wrkInfoTerminalRecord); WrkInfoStoreRecord wrkInfoStoreRecord = BeanUtil.copyProperties(dispatchDTO, WrkInfoStoreRecord.class); wrkInfoStoreRecord.setWrkId(wrkInfo.getWrkId()); + wrkInfoStoreRecord.setStoreId(dispatchDTO.getStoreId()); wrkInfoStoreRecordService.save(wrkInfoStoreRecord); } } diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml index 9ee494b..346a3df 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/resources/mapper/TerminalMapper.xml @@ -179,48 +179,45 @@