|
@@ -3,30 +3,30 @@ package com.gree.mall.manager.logic.policy;
|
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.convert.Convert;
|
|
import cn.hutool.core.convert.Convert;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
|
|
+import cn.hutool.json.JSONUtil;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.gree.mall.manager.bean.admin.AdminUserCom;
|
|
import com.gree.mall.manager.bean.admin.AdminUserCom;
|
|
|
-import com.gree.mall.manager.bean.policy.*;
|
|
|
|
|
|
|
+import com.gree.mall.manager.bean.policy.PolicyOrderDsVO;
|
|
|
|
|
+import com.gree.mall.manager.bean.policy.PolicyOrderEmVO;
|
|
|
|
|
+import com.gree.mall.manager.bean.policy.PolicyOrderInVO;
|
|
|
|
|
+import com.gree.mall.manager.bean.policy.PolicyOrderVO;
|
|
|
import com.gree.mall.manager.commonmapper.PolicyCMapper;
|
|
import com.gree.mall.manager.commonmapper.PolicyCMapper;
|
|
|
import com.gree.mall.manager.enums.*;
|
|
import com.gree.mall.manager.enums.*;
|
|
|
import com.gree.mall.manager.exception.RemoteServiceException;
|
|
import com.gree.mall.manager.exception.RemoteServiceException;
|
|
|
import com.gree.mall.manager.logic.common.CommonLogic;
|
|
import com.gree.mall.manager.logic.common.CommonLogic;
|
|
|
import com.gree.mall.manager.plus.entity.*;
|
|
import com.gree.mall.manager.plus.entity.*;
|
|
|
import com.gree.mall.manager.plus.service.*;
|
|
import com.gree.mall.manager.plus.service.*;
|
|
|
-import com.gree.mall.manager.utils.StringUtil;
|
|
|
|
|
import com.gree.mall.manager.zfire.bean.ZfireParamBean;
|
|
import com.gree.mall.manager.zfire.bean.ZfireParamBean;
|
|
|
import com.gree.mall.manager.zfire.util.FieldUtils;
|
|
import com.gree.mall.manager.zfire.util.FieldUtils;
|
|
|
import lombok.extern.log4j.Log4j;
|
|
import lombok.extern.log4j.Log4j;
|
|
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.remoting.RemoteAccessException;
|
|
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
|
|
-import java.math.BigDecimal;
|
|
|
|
|
-import java.rmi.RemoteException;
|
|
|
|
|
import java.time.Instant;
|
|
import java.time.Instant;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.LocalTime;
|
|
import java.time.LocalTime;
|
|
@@ -36,7 +36,7 @@ import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
|
-@Log4j
|
|
|
|
|
|
|
+@Slf4j
|
|
|
public class PolicyOrderLogic {
|
|
public class PolicyOrderLogic {
|
|
|
|
|
|
|
|
|
|
|
|
@@ -193,7 +193,7 @@ public class PolicyOrderLogic {
|
|
|
.one();
|
|
.one();
|
|
|
|
|
|
|
|
|
|
|
|
|
- log.info("打印导入数据:"+row.toString());
|
|
|
|
|
|
|
+ log.info("打印导入数据: {}", JSONUtil.toJsonStr(row));
|
|
|
|
|
|
|
|
if (websitUser==null)
|
|
if (websitUser==null)
|
|
|
throw new RemoteServiceException(errPrefix + "未找到该师傅");
|
|
throw new RemoteServiceException(errPrefix + "未找到该师傅");
|
