kafka参数prepare

superdesk-uniorder-dubbo-provider/src/main/java/cn/superdesk/uniorder/dubbo/provider/thirdpart/jd/DubboAccountingUnifiedSupplierOrderJdCheckUpReportServiceImpl.java

@@ -1,246 +0,0 @@
-package cn.superdesk.uniorder.dubbo.provider.thirdpart.jd;
-
-import cn.hutool.json.JSONUtil;
-import cn.superdesk.uniorder.common.numerical.AnBeanUtils;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReport;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportParam;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.*;
-import cn.superdesk.uniorder.dubbo.facade.sys.notify.DubboSysNotifyService;
-import cn.superdesk.uniorder.dubbo.facade.thirdpart.jd.DubboAccountingUnifiedSupplierOrderJdCheckUpReportService;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelService;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportService;
-import com.alibaba.dubbo.config.annotation.Reference;
-import com.alibaba.dubbo.config.annotation.Service;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-
-/**
- * @Description: 京东对账单中的订单 算是临时 sheet eg 深圳市侨城汇网络科技有限公司-2021年8月1日集采账单.xlsx
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-14 17:04:08
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-14 17:04:08
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Service(version = "1.0.0", retries = -1, timeout = 10000)
-public class DubboAccountingUnifiedSupplierOrderJdCheckUpReportServiceImpl implements DubboAccountingUnifiedSupplierOrderJdCheckUpReportService {
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportService accountingUnifiedSupplierOrderJdCheckUpReportService;
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelService accountingUnifiedSupplierOrderJdCheckUpReportExportExcelService;
-
-    /****************************************** 引用自身 Dubbo provider start ******************************************/
-    @Reference(version = "1.0.0", timeout = 10000, retries = -1)
-    private DubboSysNotifyService dubboSysNotifyService;
-
-    /****************************************** 引用自身 Dubbo provider   end ******************************************/
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    @Override
-    public void addObj(AccountingUnifiedSupplierOrderJdCheckUpReportParam param) {
-
-        AccountingUnifiedSupplierOrderJdCheckUpReport accountingUnifiedSupplierOrderJdCheckUpReport = AnBeanUtils.copy(param, AccountingUnifiedSupplierOrderJdCheckUpReport.class);
-        accountingUnifiedSupplierOrderJdCheckUpReportService.insertSelective(accountingUnifiedSupplierOrderJdCheckUpReport);
-
-    }
-
-    @Override
-    public void updateObj(AccountingUnifiedSupplierOrderJdCheckUpReportParam param) {
-
-        AccountingUnifiedSupplierOrderJdCheckUpReport accountingUnifiedSupplierOrderJdCheckUpReport = AnBeanUtils.copy(param, AccountingUnifiedSupplierOrderJdCheckUpReport.class);
-        accountingUnifiedSupplierOrderJdCheckUpReportService.updateByPrimaryKeySelective(accountingUnifiedSupplierOrderJdCheckUpReport);
-    }
-
-    @Override
-    public void deleteObj(Long id) {
-        accountingUnifiedSupplierOrderJdCheckUpReportService.deleteObj(id);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReport findById(Long id) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportService.findById(id);
-    }
-
-    @Override
-    public PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReport> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportService.findByPaging(conditions, pageNun, pageSize);
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReport> findAll(Map<String, Object> queryMap) {
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportService.findAll(queryMap);
-    }
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    @Override
-    public void addAccountingUnifiedSupplierOrderJdCheckUpReport(AccountingUnifiedSupplierOrderJdCheckUpReportParam param) {
-
-        AccountingUnifiedSupplierOrderJdCheckUpReport accountingUnifiedSupplierOrderJdCheckUpReport = AnBeanUtils.copy(param, AccountingUnifiedSupplierOrderJdCheckUpReport.class);
-        accountingUnifiedSupplierOrderJdCheckUpReportService.addAccountingUnifiedSupplierOrderJdCheckUpReport(accountingUnifiedSupplierOrderJdCheckUpReport);
-    }
-
-    @Override
-    public void updateAccountingUnifiedSupplierOrderJdCheckUpReport(AccountingUnifiedSupplierOrderJdCheckUpReportParam param) {
-
-        AccountingUnifiedSupplierOrderJdCheckUpReport accountingUnifiedSupplierOrderJdCheckUpReport = AnBeanUtils.copy(param, AccountingUnifiedSupplierOrderJdCheckUpReport.class);
-        accountingUnifiedSupplierOrderJdCheckUpReportService.updateAccountingUnifiedSupplierOrderJdCheckUpReport(accountingUnifiedSupplierOrderJdCheckUpReport);
-    }
-
-    @Override
-    public void deleteAccountingUnifiedSupplierOrderJdCheckUpReport(Long id) {
-        accountingUnifiedSupplierOrderJdCheckUpReportService.deleteAccountingUnifiedSupplierOrderJdCheckUpReport(id);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReport findAccountingUnifiedSupplierOrderJdCheckUpReportById(Long id) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportService.findAccountingUnifiedSupplierOrderJdCheckUpReportById(id);
-    }
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportService.pageQuery(conditions, pageNun, pageSize);
-    }
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo>> pageQueryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportService.pageQueryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof>> pageQueryGenericWoof(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportService.pageQueryGenericWoof(queryCriteria, loginSysUser);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReportDetailStatisticsVo pageQueryHeadGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportService.pageQueryHeadGenericParam(queryCriteria, loginSysUser);
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> queryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria criteria,
-            LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportService.queryGenericParam(criteria, loginSysUser);
-    }
-
-    /****************************************** 检查 start ******************************************/
-
-    @Override
-    public R<String> checkUpAndReportDimOrder(
-            SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo,
-            AccountingUnifiedSupplierOrderJdListItemVo itemVo) {
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportService.opCompareOrderAndCheckUpProcessDimOrderOne(listItemVo, itemVo);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReportSnapshotStruct readSnapshotJson(String batchId, String jdOrderSn) {
-
-        log.info("\nopCheckUpDebug start \n{}\n{}\nopCheckUpDebug   end", batchId, jdOrderSn);
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportService.readSnapshotJson(batchId, jdOrderSn);
-    }
-
-    /****************************************** 检查   end ******************************************/
-
-    /****************************************** export excel start ******************************************/
-
-    @Override
-    public String exportExcelJdCheckUpReportFullVersion(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        log.info("\n异步操作 包裹 外层 exportExcelJdCheckUpReport params: \n{}", JSONUtil.toJsonPrettyStr(queryCriteria));
-
-        CompletableFuture.runAsync(() -> {
-
-            try {
-
-                // 三步走 mark by linjinyu at 20210305
-                // 1. 数据
-                // 2. 生成excel
-                // 3. 通知
-                List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> resultList = accountingUnifiedSupplierOrderJdCheckUpReportService.queryGenericParam(queryCriteria, loginSysUser);
-
-                SysNotify sysNotify = accountingUnifiedSupplierOrderJdCheckUpReportExportExcelService
-                        .exportExcelJdCheckUpReportFullVersion(
-                                resultList,
-                                queryCriteria.getBatchId(),
-                                loginSysUser
-                        );
-
-                // 通知
-                dubboSysNotifyService.notifyExportExcelDimUnifiedInvoiceRegister4E6(sysNotify, loginSysUser);
-
-            } catch (Exception e2) {
-                log.error("\n异步操作 包裹 内层 exportExcelJdCheckUpReport {} -> 执行 异常:{}", JSONUtil.toJsonStr(queryCriteria), e2);
-            }
-        });
-
-        return "导出任务已经接收,正在处理中...";
-    }
-
-    @Override
-    public String exportExcelJdCheckUpReportLiteVersion(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria criteria,
-            LoginSysUser loginSysUser) {
-
-        log.info("\n异步操作 包裹 外层 exportExcelJdCheckUpReport params: \n{}", JSONUtil.toJsonPrettyStr(criteria));
-
-        CompletableFuture.runAsync(() -> {
-
-            try {
-
-                // 三步走 mark by linjinyu at 20210305
-                // 1. 数据
-                // 2. 生成excel
-                // 3. 通知
-                List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> resultList = accountingUnifiedSupplierOrderJdCheckUpReportService.queryGenericParam(criteria, loginSysUser);
-
-                SysNotify sysNotify = accountingUnifiedSupplierOrderJdCheckUpReportExportExcelService
-                        .exportExcelJdCheckUpReportLiteVersion(
-                                resultList,
-                                criteria.getBatchId(),
-                                loginSysUser
-                        );
-
-                // 通知
-                dubboSysNotifyService.notifyExportExcelDimUnifiedInvoiceRegister4E6(sysNotify, loginSysUser);
-
-            } catch (Exception e2) {
-                log.error("\n异步操作 包裹 内层 exportExcelJdCheckUpReport {} -> 执行 异常:{}", JSONUtil.toJsonStr(criteria), e2);
-            }
-
-        });
-
-        return "导出任务已经接收,正在处理中...";
-    }
-
-    /****************************************** export excel   end ******************************************/
-}

superdesk-uniorder-dubbo-provider/src/main/java/cn/superdesk/uniorder/dubbo/provider/thirdpart/jd/DubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsServiceImpl.java

@@ -1,123 +0,0 @@
-package cn.superdesk.uniorder.dubbo.provider.thirdpart.jd;
-
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoods;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsHeadVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo;
-import cn.superdesk.uniorder.dubbo.facade.thirdpart.jd.DubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService;
-import com.alibaba.dubbo.config.annotation.Service;
-import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description:
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2022-06-22 16:27:47
- * @UpdateUser: linjinyu
- * @UpdateDate: 2022-06-22 16:27:47
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Service(version = "1.0.0", retries = -1, timeout = 10000)
-public class DubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsServiceImpl implements DubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService {
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService;
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    @Override
-    public int insertSelective(AccountingUnifiedSupplierOrderJdCheckUpReportXGoods entity) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.insertSelective(entity);
-    }
-
-    @Override
-    public int updateByPrimaryKeySelective(AccountingUnifiedSupplierOrderJdCheckUpReportXGoods entity) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.updateByPrimaryKeySelective(entity);
-    }
-
-    @Override
-    public void deleteObj(Long id) {
-        accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.deleteObj(id);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReportXGoods findById(Long id) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.findById(id);
-    }
-
-    @Override
-    public PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.findByPaging(conditions, pageNun, pageSize);
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> findAll(Map<String, Object> queryMap) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.findAll(queryMap);
-    }
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    /****************************************** Biz 部分 start ******************************************/
-
-    @Override
-    public int addAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam param, LoginSysUser loginSysUser) {
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.addAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(param, loginSysUser);
-    }
-
-    @Override
-    public int updateAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam param, LoginSysUser loginSysUser) {
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.updateAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(param, loginSysUser);
-    }
-
-    @Override
-    public int deleteAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(Long id, LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.deleteAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(id, loginSysUser);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo findListItemVoById(Long id, LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.findListItemVoById(id, loginSysUser);
-    }
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.pageQuery(conditions, pageNun, pageSize);
-    }
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo>> pageQueryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.pageQueryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsHeadVo queryHeadGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.queryHeadGenericParam(queryCriteria, loginSysUser);
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo> queryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.queryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    /****************************************** Biz 部分   end ******************************************/
-
-}

superdesk-uniorder-dubbo-provider/src/main/java/cn/superdesk/uniorder/dubbo/provider/thirdpart/jd/DubboAccountingUnifiedSupplierOrderJdServiceImpl.java

@@ -1,252 +0,0 @@
-package cn.superdesk.uniorder.dubbo.provider.thirdpart.jd;
-
-import cn.hutool.json.JSONUtil;
-import cn.superdesk.uniorder.common.numerical.AnBeanUtils;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJd;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.*;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdDetailStatisticsVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdListItemVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdUpperLevelsStatisticsVo;
-import cn.superdesk.uniorder.dubbo.facade.sys.notify.DubboSysNotifyService;
-import cn.superdesk.uniorder.dubbo.facade.thirdpart.jd.DubboAccountingUnifiedSupplierOrderJdService;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdExportExcelService;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdService;
-import com.alibaba.dubbo.config.annotation.Reference;
-import com.alibaba.dubbo.config.annotation.Service;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-/**
- * @Description: 京东对账单中的订单 算是临时 sheet eg 深圳市侨城汇网络科技有限公司-2021年8月1日集采账单.xlsx
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-12 11:29:24
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-12 11:29:24
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Service(version = "1.0.0", retries = -1, timeout = 10000)
-public class DubboAccountingUnifiedSupplierOrderJdServiceImpl implements DubboAccountingUnifiedSupplierOrderJdService {
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdService            accountingUnifiedSupplierOrderJdService;
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdExportExcelService accountingUnifiedSupplierOrderJdExportExcelService;
-
-    /****************************************** 引用自身 Dubbo provider start ******************************************/
-    @Reference(version = "1.0.0", timeout = 10000, retries = -1)
-    private DubboSysNotifyService dubboSysNotifyService;
-
-    /****************************************** 引用自身 Dubbo provider   end ******************************************/
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    @Override
-    public void addObj(AccountingUnifiedSupplierOrderJdParam param) {
-
-        AccountingUnifiedSupplierOrderJd accountingUnifiedSupplierOrderJd = AnBeanUtils.copy(param, AccountingUnifiedSupplierOrderJd.class);
-        accountingUnifiedSupplierOrderJdService.insertSelective(accountingUnifiedSupplierOrderJd);
-
-    }
-
-    @Override
-    public void updateObj(AccountingUnifiedSupplierOrderJdParam param) {
-
-        AccountingUnifiedSupplierOrderJd accountingUnifiedSupplierOrderJd = AnBeanUtils.copy(param, AccountingUnifiedSupplierOrderJd.class);
-        accountingUnifiedSupplierOrderJdService.updateByPrimaryKeySelective(accountingUnifiedSupplierOrderJd);
-    }
-
-    @Override
-    public void deleteObj(Long id) {
-        accountingUnifiedSupplierOrderJdService.deleteObj(id);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJd findById(Long id) {
-        return accountingUnifiedSupplierOrderJdService.findById(id);
-    }
-
-    @Override
-    public PageInfo<AccountingUnifiedSupplierOrderJd> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-        return accountingUnifiedSupplierOrderJdService.findByPaging(conditions, pageNun, pageSize);
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJd> findAll(Map<String, Object> queryMap) {
-
-        return accountingUnifiedSupplierOrderJdService.findAll(queryMap);
-    }
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    @Override
-    public void addAccountingUnifiedSupplierOrderJd(AccountingUnifiedSupplierOrderJdParam param) {
-
-        AccountingUnifiedSupplierOrderJd accountingUnifiedSupplierOrderJd = AnBeanUtils.copy(param, AccountingUnifiedSupplierOrderJd.class);
-        accountingUnifiedSupplierOrderJdService.addAccountingUnifiedSupplierOrderJd(accountingUnifiedSupplierOrderJd);
-    }
-
-    @Override
-    public void updateAccountingUnifiedSupplierOrderJd(AccountingUnifiedSupplierOrderJdParam param) {
-
-        AccountingUnifiedSupplierOrderJd accountingUnifiedSupplierOrderJd = AnBeanUtils.copy(param, AccountingUnifiedSupplierOrderJd.class);
-        accountingUnifiedSupplierOrderJdService.updateAccountingUnifiedSupplierOrderJd(accountingUnifiedSupplierOrderJd);
-    }
-
-    @Override
-    public void deleteAccountingUnifiedSupplierOrderJd(Long id) {
-        accountingUnifiedSupplierOrderJdService.deleteAccountingUnifiedSupplierOrderJd(id);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJd findAccountingUnifiedSupplierOrderJdById(Long id) {
-        return accountingUnifiedSupplierOrderJdService.findAccountingUnifiedSupplierOrderJdById(id);
-    }
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJd>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize) {
-        return accountingUnifiedSupplierOrderJdService.pageQuery(conditions, pageNun, pageSize);
-    }
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJdListItemVo>> pageQueryGenericParam(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdService.pageQueryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJdListItemVo> queryGenericParam(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdService.queryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdDetailStatisticsVo pageQueryHeadGenericParam(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdService.pageQueryHeadGenericParam(queryCriteria, loginSysUser);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdUpperLevelsStatisticsVo statisticsQuantityDimOrderNormalOrException(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria, LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdService.statisticsQuantityDimOrderNormalOrException(queryCriteria, loginSysUser);
-    }
-
-    /**************************************** excel export start ****************************************/
-
-    @Override
-    public String exportExcelJdImportRecord(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        log.info("\n异步操作 包裹 外层 exportExcelJdImportRecord params: \n{}", JSONUtil.toJsonPrettyStr(queryCriteria));
-
-        CompletableFuture.runAsync(() -> {
-
-            try {
-
-                // 三步走 mark by linjinyu at 20210305
-                // 1. 数据
-                // 2. 生成excel
-                // 3. 通知
-                List<AccountingUnifiedSupplierOrderJdListItemVo> resultList = accountingUnifiedSupplierOrderJdService.queryGenericParam(queryCriteria, loginSysUser);
-
-                SysNotify sysNotify = accountingUnifiedSupplierOrderJdExportExcelService
-                        .exportExcelJdImportRecord(
-                                resultList,
-                                queryCriteria.getBatchId(),
-                                loginSysUser
-                        );
-
-                // 通知
-                dubboSysNotifyService.notifyExportExcelDimUnifiedInvoiceRegister4E6(sysNotify, loginSysUser);
-
-            } catch (Exception e2) {
-                log.error("\n异步操作 包裹 内层 exportExcelJdImportRecord {} -> 执行 异常:{}", JSONUtil.toJsonStr(queryCriteria), e2);
-            }
-        });
-
-        return "任务已经接收,正在处理中...";
-
-    }
-
-    /**************************************** excel export start ****************************************/
-
-
-    /****************************************** excel import start start ******************************************/
-
-
-    @Override
-    public SysNotify opExcelImportFullVersion(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser) {
-
-        // TODO !!!注意!!! 没有在此层开线程
-
-        return accountingUnifiedSupplierOrderJdService.opImportExcelFullVersion(form, loginSysUser);
-    }
-
-    @Override
-    public SysNotify opExcelImportLiteVersion(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser) {
-
-        // TODO !!!注意!!! 没有在此层开线程
-
-        return accountingUnifiedSupplierOrderJdService.opImportExcelLiteVersion(form, loginSysUser);
-    }
-
-    @Override
-    public void saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRow(
-            AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow excelRow,
-            LoginSysUser loginSysUser) {
-
-        if (null == excelRow) {
-            return;
-        }
-        accountingUnifiedSupplierOrderJdService.saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRow(excelRow, loginSysUser);
-    }
-
-    @Override
-    public void saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRowList(
-            List<AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow> excelRowList,
-            LoginSysUser loginSysUser) {
-
-        accountingUnifiedSupplierOrderJdService.saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRowList(excelRowList, loginSysUser);
-    }
-
-    @Override
-    public void saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRow(
-            AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow excelRow,
-            LoginSysUser loginSysUser) {
-        if (null == excelRow) {
-            return;
-        }
-        accountingUnifiedSupplierOrderJdService.saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRow(excelRow, loginSysUser);
-    }
-
-    @Override
-    public void saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRowList(
-            List<AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow> excelRowList,
-            LoginSysUser loginSysUser) {
-        accountingUnifiedSupplierOrderJdService.saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRowList(excelRowList, loginSysUser);
-    }
-
-    /****************************************** excel import start   end ******************************************/
-
-}

superdesk-uniorder-dubbo-provider/src/main/java/cn/superdesk/uniorder/dubbo/provider/thirdpart/jd/DubboSysQuartzScheduleTaskStatementOfAccountJdExOpPartServiceImpl.java

@@ -1,49 +0,0 @@
-package cn.superdesk.uniorder.dubbo.provider.thirdpart.jd;
-
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpCancelForm;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpConfirmForm;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpDeleteForm;
-import cn.superdesk.uniorder.dubbo.facade.thirdpart.jd.DubboSysQuartzScheduleTaskStatementOfAccountJdExOpPartService;
-import cn.superdesk.uniorder.service.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdExOpPartService;
-import com.alibaba.dubbo.config.annotation.Service;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-/**
- * @Description: 
- * @Author: linjinyu
- * @CreateDate: 10/12/20 4:28 PM
- * @UpdateUser: linjinyu
- * @UpdateDate: 10/12/20 4:28 PM
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Service(version = "1.0.0", retries = -1, timeout = 10000)
-public class DubboSysQuartzScheduleTaskStatementOfAccountJdExOpPartServiceImpl implements DubboSysQuartzScheduleTaskStatementOfAccountJdExOpPartService {
-
-	@Autowired
-	private SysQuartzScheduleTaskStatementOfAccountJdExOpPartService sysQuartzScheduleTaskStatementOfAccountJdExOpPartService;
-
-
-
-	@Override
-	public int opDelete(SysQuartzScheduleTaskStatementOfAccountJdOpDeleteForm entity, LoginSysUser loginSysUser) {
-		return sysQuartzScheduleTaskStatementOfAccountJdExOpPartService.opDelete(entity, loginSysUser);
-	}
-
-	@Override
-	public int opCancel(SysQuartzScheduleTaskStatementOfAccountJdOpCancelForm entity, LoginSysUser loginSysUser) {
-		return sysQuartzScheduleTaskStatementOfAccountJdExOpPartService.opCancel(entity, loginSysUser);
-	}
-
-	@Override
-	public int opConfirm(SysQuartzScheduleTaskStatementOfAccountJdOpConfirmForm entity, LoginSysUser loginSysUser) {
-		return sysQuartzScheduleTaskStatementOfAccountJdExOpPartService.opConfirm(entity, loginSysUser);
-	}
-
-
-
-}

superdesk-uniorder-dubbo-provider/src/main/java/cn/superdesk/uniorder/dubbo/provider/thirdpart/jd/DubboSysQuartzScheduleTaskStatementOfAccountJdServiceImpl.java

@@ -1,374 +0,0 @@
-package cn.superdesk.uniorder.dubbo.provider.thirdpart.jd;
-
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.json.JSONUtil;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskAccountingStatusEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskCheckStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskProcessStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskRunStatusEnum;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJd;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.*;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdHeadVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdListItemVo;
-import cn.superdesk.uniorder.dubbo.facade.sys.notify.DubboSysNotifyService;
-import cn.superdesk.uniorder.dubbo.facade.thirdpart.jd.DubboSysQuartzScheduleTaskStatementOfAccountJdService;
-import cn.superdesk.uniorder.service.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdExOpPartService;
-import cn.superdesk.uniorder.service.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdService;
-import com.alibaba.dubbo.config.annotation.Reference;
-import com.alibaba.dubbo.config.annotation.Service;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-
-/**
- * @Description: 定时任务-时刻任务-对账单
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-12 11:29:24
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-12 11:29:24
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Service(version = "1.0.0", retries = -1, timeout = 10000)
-public class DubboSysQuartzScheduleTaskStatementOfAccountJdServiceImpl implements DubboSysQuartzScheduleTaskStatementOfAccountJdService {
-
-    @Autowired
-    private SysQuartzScheduleTaskStatementOfAccountJdService         sysQuartzScheduleTaskStatementOfAccountJdService;
-    @Autowired
-    private SysQuartzScheduleTaskStatementOfAccountJdExOpPartService sysQuartzScheduleTaskStatementOfAccountJdExOpPartService;
-
-
-    /****************************************** 引用自身 Dubbo provider start ******************************************/
-    @Reference(version = "1.0.0", timeout = 10000, retries = -1)
-    private DubboSysNotifyService dubboSysNotifyService;
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    @Override
-    public int insertSelective(SysQuartzScheduleTaskStatementOfAccountJd entity) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.insertSelective(entity);
-    }
-
-    @Override
-    public int updateByPrimaryKeySelective(SysQuartzScheduleTaskStatementOfAccountJd entity) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.updateByPrimaryKeySelective(entity);
-    }
-
-    @Override
-    public void deleteObj(Long id) {
-        sysQuartzScheduleTaskStatementOfAccountJdService.deleteObj(id);
-    }
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJd findById(Long id) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.findById(id);
-    }
-
-    @Override
-    public PageInfo<SysQuartzScheduleTaskStatementOfAccountJd> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.findByPaging(conditions, pageNun, pageSize);
-    }
-
-    @Override
-    public List<SysQuartzScheduleTaskStatementOfAccountJd> findAll(Map<String, Object> queryMap) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.findAll(queryMap);
-    }
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    @Override
-    public int addSysQuartzScheduleTaskStatementOfAccountJd(SysQuartzScheduleTaskStatementOfAccountJdParam param, LoginSysUser loginSysUser) {
-
-        return sysQuartzScheduleTaskStatementOfAccountJdService.addSysQuartzScheduleTaskStatementOfAccountJd(param, loginSysUser);
-    }
-
-    @Override
-    public int updateSysQuartzScheduleTaskStatementOfAccountJd(SysQuartzScheduleTaskStatementOfAccountJdParam param, LoginSysUser loginSysUser) {
-
-        return sysQuartzScheduleTaskStatementOfAccountJdService.updateSysQuartzScheduleTaskStatementOfAccountJd(param, loginSysUser);
-    }
-
-    @Override
-    public int deleteSysQuartzScheduleTaskStatementOfAccountJd(Long id, LoginSysUser loginSysUser) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.deleteSysQuartzScheduleTaskStatementOfAccountJd(id, loginSysUser);
-    }
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo findListItemVoById(Long id, LoginSysUser loginSysUser) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.findListItemVoById(id, loginSysUser);
-    }
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo findListItemVoByBatchId(String batchId, LoginSysUser loginSysUser) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.findListItemVoByBatchId(batchId, loginSysUser);
-    }
-
-    @Override
-    public R<List<SysQuartzScheduleTaskStatementOfAccountJd>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.pageQuery(conditions, pageNun, pageSize);
-    }
-
-    @Override
-    public R<List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo>> pageQueryGenericParam(
-            SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.pageQueryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJdHeadVo queryHeadGenericParam(
-            SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.queryHeadGenericParam(queryCriteria, loginSysUser);
-    }
-
-    @Override
-    public List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> queryGenericParam(
-            SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.queryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo deQueueOneImportExcel(LoginSysUser loginSysUser) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.deQueueOneImportExcel(loginSysUser);
-    }
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo deQueueOneCompareOrderAndCheckUpThenReport(LoginSysUser loginSysUser) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.deQueueOneCompareOrderAndCheckUpThenReport(loginSysUser);
-    }
-
-    /**************************************** 操作 start ****************************************/
-
-
-    @Override
-    public int opSetRemark(SysQuartzScheduleTaskStatementOfAccountJdOpSetRemarkForm form, LoginSysUser loginSysUser) {
-
-        return sysQuartzScheduleTaskStatementOfAccountJdService.updateByPrimaryKeySelective(
-                SysQuartzScheduleTaskStatementOfAccountJd
-                        .builder()
-
-                        .id(form.getSysQuartzScheduleTaskStatementOfAccountJdId())
-
-                        .remark(form.getRemark())
-
-                        .updateTime(DateUtil.date())
-                        .updateUserId(loginSysUser.getSysUserId())
-
-                        .build()
-        );
-
-    }
-
-    @Override
-    public int opSetIsPause(SysQuartzScheduleTaskStatementOfAccountJdOpSetIsPauseForm form, LoginSysUser loginSysUser) {
-
-        return sysQuartzScheduleTaskStatementOfAccountJdService.updateByBatchIdSelective(
-                SysQuartzScheduleTaskStatementOfAccountJd
-                        .builder()
-
-                        .batchId(form.getBatchId())
-
-                        .isPause(form.getIsPauseEnum().getKey())
-
-                        .build()
-        );
-    }
-
-
-    /**************************************** 操作 start ****************************************/
-
-
-    /**************************************** 任务牵引方法 懒得做状态机 start ****************************************/
-
-
-    @Override
-    public int towImportExcel(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            ScheduleTaskRunStatusEnum runStatusEnum,
-            ScheduleTaskProcessStateEnum processStateEnum,
-            LoginSysUser loginSysUser) {
-
-        return sysQuartzScheduleTaskStatementOfAccountJdService.towImportExcel(
-                form,
-                runStatusEnum,
-                processStateEnum,
-                loginSysUser
-        );
-    }
-
-    @Override
-    public int towCompareOrderAndCheckUpThenReport(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            ScheduleTaskRunStatusEnum runStatusEnum, ScheduleTaskAccountingStatusEnum statusEnum,
-            LoginSysUser loginSysUser) {
-        return sysQuartzScheduleTaskStatementOfAccountJdService.towCompareOrderAndCheckUpThenReport(
-                form,
-                runStatusEnum,
-                statusEnum,
-                loginSysUser
-        );
-    }
-
-
-    /**************************************** 任务牵引方法 懒得做状态机   end ****************************************/
-
-
-    /**************************************** 导入任务 start ****************************************/
-
-    @Override
-    public String asyncExcelImportFullVersion(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser) {
-
-        CompletableFuture<Void> voidCompletableFuture = CompletableFuture.runAsync(() -> {
-
-            try {
-
-
-                SysNotify sysNotify = sysQuartzScheduleTaskStatementOfAccountJdService
-                        .dispatcherExcelImportFullVersion(
-                                form,
-                                loginSysUser
-                        );
-
-                SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo = sysQuartzScheduleTaskStatementOfAccountJdService.findListItemVoByBatchId(form.getBatchId(), loginSysUser);
-                sysNotify.setContent(JSONUtil.toJsonStr(listItemVo));
-
-                // 通知
-                dubboSysNotifyService.notifyAsyncExcelImportFullVersion(sysNotify, form.getBatchId(), loginSysUser);
-
-            } catch (Exception e2) {
-                log.error("\n异步操作 包裹 内层 asyncExcelImportFullVersion{} -> 执行 异常:{}", JSONUtil.toJsonStr(form), e2);
-            }
-
-        });
-
-        return "导入任务已经接收,正在处理中...";
-    }
-
-    @Override
-    public String asyncExcelImportLiteVersion(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser) {
-
-        CompletableFuture<Void> voidCompletableFuture = CompletableFuture.runAsync(() -> {
-
-            try {
-
-                SysNotify sysNotify = sysQuartzScheduleTaskStatementOfAccountJdService
-                        .dispatcherExcelImportLiteVersion(
-                                form,
-                                loginSysUser
-                        );
-
-
-                SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo = sysQuartzScheduleTaskStatementOfAccountJdService.findListItemVoByBatchId(form.getBatchId(), loginSysUser);
-                sysNotify.setContent(JSONUtil.toJsonStr(listItemVo));
-
-
-                // 通知
-                dubboSysNotifyService.notifyAsyncExcelImportLiteVersion(sysNotify, form.getBatchId(), loginSysUser);
-
-            } catch (Exception e2) {
-                log.error("\n异步操作 包裹 内层 asyncExcelImportLiteVersion{} -> 执行 异常:{}", JSONUtil.toJsonStr(form), e2);
-
-                sysQuartzScheduleTaskStatementOfAccountJdService.towImportExcel(
-                        form,
-                        ScheduleTaskRunStatusEnum.已导入,
-                        ScheduleTaskProcessStateEnum.导入失败,
-                        loginSysUser
-                );
-            }
-        });
-
-        return "导入任务已经接收,正在处理中...";
-    }
-
-    /**************************************** 导入任务 start ****************************************/
-
-    /**************************************** 检查任务 start ****************************************/
-
-    @Override
-    public String asyncCompareOrderAndCheckUpThenReport(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser) {
-
-        CompletableFuture<Void> voidCompletableFuture = CompletableFuture.runAsync(() -> {
-
-            try {
-
-                SysNotify sysNotify = sysQuartzScheduleTaskStatementOfAccountJdService
-                        .dispatcherCompareOrderAndCheckUpThenReport(
-                                form,
-                                loginSysUser
-                        );
-
-                // 通知
-                dubboSysNotifyService.notifyAsyncCompareOrderAndCheckUpThenReport(sysNotify, form.getBatchId(), loginSysUser);
-
-            } catch (Exception e2) {
-
-                log.error("\n异步操作 包裹 内层 asyncExcelImportLiteVersion{} -> 执行 异常:{}", JSONUtil.toJsonStr(form), e2);
-
-                sysQuartzScheduleTaskStatementOfAccountJdService.towCompareOrderAndCheckUpThenReportThrowException(
-                        form,
-                        ScheduleTaskRunStatusEnum.已对账,
-                        ScheduleTaskAccountingStatusEnum.对账完成,
-                        ScheduleTaskCheckStateEnum.异常,
-                        loginSysUser
-                );
-            }
-        });
-
-        return "导入任务已经接收,正在处理中...";
-    }
-
-    @Override
-    public String asyncCompareOrderAndCheckUpThenReportOnlyException(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser) {
-
-        CompletableFuture<Void> voidCompletableFuture = CompletableFuture.runAsync(() -> {
-
-            try {
-
-                SysNotify sysNotify = sysQuartzScheduleTaskStatementOfAccountJdService
-                        .dispatcherCompareOrderAndCheckUpThenReportOnlyException(
-                                form,
-                                loginSysUser
-                        );
-
-                // 通知
-                dubboSysNotifyService.notifyExportExcelUnifiedCustomerInvoice2GoodsDetail(sysNotify, loginSysUser);
-
-            } catch (Exception e2) {
-
-                log.error("\n异步操作 包裹 内层 asyncExcelImportLiteVersion{} -> 执行 异常:{}", JSONUtil.toJsonStr(form), e2);
-
-                sysQuartzScheduleTaskStatementOfAccountJdService.towCompareOrderAndCheckUpThenReportThrowException(
-                        form,
-                        ScheduleTaskRunStatusEnum.已对账,
-                        ScheduleTaskAccountingStatusEnum.对账完成,
-                        ScheduleTaskCheckStateEnum.异常,
-                        loginSysUser
-                );
-            }
-        });
-
-        return "导入任务已经接收,正在处理中...";
-    }
-
-}

superdesk-uniorder-executor/superdesk-uniorder-executor-scheduler-xxl-job/src/main/java/cn/superdesk/uniorder/executor/scheduler/xxljob/thirdpart/jd/AccountingOrderUnifiedSupplierJdTask.java

@@ -1,181 +0,0 @@
-package cn.superdesk.uniorder.executor.scheduler.xxljob.thirdpart.jd;
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskAccountingStatusEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskProcessStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskRunStatusEnum;
-import cn.superdesk.uniorder.common.json.AnJsonUtils;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm;
-import cn.superdesk.uniorder.dto.vo.accounting.unified.supplier.AccountingOrderUnifiedSupplierListItemVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdListItemVo;
-import cn.superdesk.uniorder.service.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdService;
-import com.xxl.job.core.context.XxlJobHelper;
-import com.xxl.job.core.handler.annotation.XxlJob;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * @Description: Java类作用描述
- * @Author: linjinyu
- * @CreateDate: 2022/5/20 12:14 下午
- * @UpdateUser: linjinyu
- * @UpdateDate: 2022/5/20 12:14 下午
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Component
-@RequiredArgsConstructor
-public class AccountingOrderUnifiedSupplierJdTask {
-
-    private final SysQuartzScheduleTaskStatementOfAccountJdService sysQuartzScheduleTaskStatementOfAccountJdService;
-
-    @XxlJob("AccountingOrderUnifiedSupplierJdTaskDeQueueOneImportExcel")
-    public void deQueueOneImportExcel() {
-
-        StringBuffer report = new StringBuffer();
-
-        String jobParam = XxlJobHelper.getJobParam();
-
-        report.append("\nXxlJob deQueueOneImportExcel")
-                .append(StrUtil.format("\njobParam : {}", jobParam));
-
-        LoginSysUser loginSysUser = LoginSysUser
-                .builder()
-                .sysUserId(996L)
-                .fullName("任务执行者")
-                .sysUserName("xxljob")
-                .build();
-
-        report.append(StrUtil.format("\nloginSysUser : {}", loginSysUser));
-
-        /**************************************** 任务开始 start ****************************************/
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo taskOne = sysQuartzScheduleTaskStatementOfAccountJdService
-                .deQueueOneImportExcel(
-                        loginSysUser
-                );
-
-        report.append(StrUtil.format("\ntaskOne : {}", JSONUtil.toJsonStr(taskOne)));
-
-        if (ObjectUtil.isNotNull(taskOne)) {
-
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form =
-                    AnJsonUtils.toObject(taskOne.getParams(), SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm.class);
-
-            report.append(StrUtil.format("\nform : {}", JSONUtil.toJsonStr(form)));
-
-            log.info(report.toString());
-//            XxlJobHelper.log(report.toString());
-//            System.out.println(report.toString());
-
-            try {
-
-                sysQuartzScheduleTaskStatementOfAccountJdService.dispatcherExcelImportLiteVersion(form, loginSysUser);
-
-            } catch (Exception e2) {
-                log.error("XxlJob deQueueOneImportExcel 执行 异常:{}", JSONUtil.toJsonStr(form), e2);
-
-                sysQuartzScheduleTaskStatementOfAccountJdService.towImportExcel(
-                        form,
-                        ScheduleTaskRunStatusEnum.已导入,
-                        ScheduleTaskProcessStateEnum.导入失败,
-                        loginSysUser
-                );
-
-                // TODO mark by linjinyu at 2022-06-167 01:00:28 - 告诉xxljob 此任务失败
-            }
-
-
-        } else {
-            // 空转情况
-
-            report.append(StrUtil.format("\nform : {}", "NULL"));
-
-            log.info(report.toString());
-//            XxlJobHelper.log(report.toString());
-//            System.out.println(report.toString());
-        }
-
-
-        /**************************************** 任务开始   end ****************************************/
-    }
-
-    @XxlJob("AccountingOrderUnifiedSupplierJdTaskDeQueueOneCompareOrderAndCheckUpThenReport")
-    public void deQueueOneCompareOrderAndCheckUpThenReport() {
-
-        StringBuffer report = new StringBuffer();
-
-        String jobParam = XxlJobHelper.getJobParam();
-
-        report.append("\nXxlJob deQueueOneCompareOrderAndCheckUpThenReport")
-                .append(StrUtil.format("\njobParam : {}", jobParam));
-
-        List<AccountingOrderUnifiedSupplierListItemVo> resultList = null;
-        LoginSysUser loginSysUser = LoginSysUser
-                .builder()
-                .sysUserId(996L)
-                .fullName("任务执行者")
-                .sysUserName("xxljob")
-                .build();
-
-        report.append(StrUtil.format("\nloginSysUser : {}", loginSysUser));
-
-        /**************************************** 任务开始 start ****************************************/
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo taskOne = sysQuartzScheduleTaskStatementOfAccountJdService
-                .deQueueOneCompareOrderAndCheckUpThenReport(
-                        loginSysUser
-                );
-
-        report.append(StrUtil.format("\ntaskOne : {}", JSONUtil.toJsonStr(taskOne)));
-
-        if (ObjectUtil.isNotNull(taskOne)) {
-
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form =
-                    AnJsonUtils.toObject(taskOne.getParams(), SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm.class);
-
-            report.append(StrUtil.format("\nform : {}", JSONUtil.toJsonStr(form)));
-
-            log.info(report.toString());
-//            XxlJobHelper.log(report.toString());
-//            System.out.println(report.toString());
-
-            try {
-
-                sysQuartzScheduleTaskStatementOfAccountJdService.dispatcherCompareOrderAndCheckUpThenReport(form, loginSysUser);
-            } catch (Exception e2) {
-
-                log.error("\nXxlJob deQueueOneCompareOrderAndCheckUpThenReport 执行 异常:{}", JSONUtil.toJsonStr(form), e2);
-
-                sysQuartzScheduleTaskStatementOfAccountJdService.towCompareOrderAndCheckUpThenReport(
-                        form,
-                        ScheduleTaskRunStatusEnum.已对账,
-                        ScheduleTaskAccountingStatusEnum.对账完成,
-                        loginSysUser
-                );
-
-                // TODO mark by linjinyu at 2022-06-167 01:00:28 - 告诉xxljob 此任务失败
-            }
-
-
-        } else {
-
-            // 空转情况
-
-            report.append(StrUtil.format("\nform : {}", "NULL"));
-
-            log.info(report.toString());
-//            XxlJobHelper.log(report.toString());
-//            System.out.println(report.toString());
-        }
-
-        /**************************************** 任务开始   end ****************************************/
-    }
-}

superdesk-uniorder-executor/superdesk-uniorder-executor-scheduler-xxl-job/src/main/java/cn/superdesk/uniorder/executor/scheduler/xxljob/thirdpart/package-info.java

@@ -1 +0,0 @@
-package cn.superdesk.uniorder.executor.scheduler.xxljob.thirdpart;

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelService.java

@@ -1,30 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd;
-
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo;
-
-import java.util.List;
-
-/**
- * @Description: 比对数据结果导出
- * @Author: linjinyu
- * @CreateDate: 2021/11/5 上午11:24
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021/11/5 上午11:24
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-public interface AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelService {
-
-    SysNotify exportExcelJdCheckUpReportFullVersion(
-            List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> resultList,
-            String batchId,
-            LoginSysUser loginSysUser);
-
-    SysNotify exportExcelJdCheckUpReportLiteVersion(
-            List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> resultList,
-            String batchId,
-            LoginSysUser loginSysUser);
-
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/AccountingUnifiedSupplierOrderJdCheckUpReportService.java

@@ -1,165 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd;
-
-
-import cn.hutool.core.date.DateTime;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReport;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimOrder;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportTaskQueryCriteria;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.*;
-import cn.superdesk.uniorder.service.base.BaseService;
-import com.github.pagehelper.PageInfo;
-
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * @Description: 京东对账单中的订单 算是临时 sheet eg 深圳市侨城汇网络科技有限公司-2021年8月1日集采账单.xlsx
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-14 17:04:08
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-14 17:04:08
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-public interface AccountingUnifiedSupplierOrderJdCheckUpReportService extends BaseService<AccountingUnifiedSupplierOrderJdCheckUpReport> {
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    @Override
-    int insertSelective(AccountingUnifiedSupplierOrderJdCheckUpReport entity);
-
-    @Override
-    int updateByPrimaryKeySelective(AccountingUnifiedSupplierOrderJdCheckUpReport entity);
-
-    int saveOrUpdateByPrimaryKeySelective(AccountingUnifiedSupplierOrderJdCheckUpReport entityCheckUpReport, DateTime now);
-
-    @Override
-    @Deprecated
-    void deleteObj(Long id);
-
-    @Override
-    @Deprecated
-    AccountingUnifiedSupplierOrderJdCheckUpReport findById(Long id);
-
-    @Override
-    @Deprecated
-    PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReport> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize);
-
-    @Override
-    @Deprecated
-    List<AccountingUnifiedSupplierOrderJdCheckUpReport> findAll(Map<String, Object> queryMap);
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    int addAccountingUnifiedSupplierOrderJdCheckUpReport(AccountingUnifiedSupplierOrderJdCheckUpReport entity);
-
-    int updateAccountingUnifiedSupplierOrderJdCheckUpReport(AccountingUnifiedSupplierOrderJdCheckUpReport entity);
-
-    int deleteAccountingUnifiedSupplierOrderJdCheckUpReport(Long id);
-
-    int deleteByBatchId(String batchId);
-
-    AccountingUnifiedSupplierOrderJdCheckUpReport findAccountingUnifiedSupplierOrderJdCheckUpReportById(Long id);
-
-    AccountingUnifiedSupplierOrderJdCheckUpReport findByBatchIdAndJdOrderSn(String batchId, String jdOrderSn);
-
-    AccountingUnifiedSupplierOrderJdCheckUpReport findByBatchIdAndJdOrderSnAndAccountingUnifiedSupplierOrderJdId(
-            String batchId,
-            String jdOrderSn,
-            Long accountingUnifiedSupplierOrderJdId);
-
-    R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize);
-
-    R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo>> pageQueryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser);
-
-    R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof>> pageQueryGenericWoof(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser);
-
-    AccountingUnifiedSupplierOrderJdCheckUpReportDetailStatisticsVo pageQueryHeadGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser);
-
-    List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> queryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria criteria,
-            LoginSysUser loginSysUser);
-
-    List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof> queryGenericWoof(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria criteria,
-            LoginSysUser loginSysUser);
-
-    AccountingUnifiedSupplierOrderJdCheckUpReportUpperLevelsStatisticsVo statisticsQuantityDimOrderNormalOrException(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser);
-
-
-    /****************************************** 检查 start ******************************************/
-
-
-    List<AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimOrder> simulateGoodsSelectedDimOrder(
-            AccountingUnifiedSupplierOrderJdCheckUpReportTaskQueryCriteria queryCriteria);
-
-    R<String> opCompareOrderAndCheckUpProcessDimOrderOne(
-            SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo,
-            AccountingUnifiedSupplierOrderJdListItemVo itemVo);
-
-    AccountingUnifiedSupplierOrderJdCheckUpReportSnapshotStruct readSnapshotJson(String batchId, String jdOrderSn);
-
-    SysNotify opCompareOrderAndCheckUp(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo, LoginSysUser loginSysUser);
-
-    SysNotify opCompareOrderAndCheckUpOnlyException(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo,
-            LoginSysUser loginSysUser);
-
-//	SELECT order_sn FROM `accounting_unified_supplier_order_jd_check_up_report` WHERE process_result = 1 and batch_id = '1450042895204749312'
-
-//	SELECT *
-//	FROM
-//	    unified_order_goods uog
-//	    LEFT JOIN unified_order uo ON uog.order_sn = uo.order_sn
-//	WHERE uo.order_sn in (
-//			SELECT order_sn FROM `accounting_unified_supplier_order_jd_check_up_report` WHERE process_result = 1 and batch_id = '1450042895204749312'
-//	)
-
-//	19960
-//	SELECT
-//	uo.id as unified_order_id,
-//	uog.id as unified_order_goods_id
-//			FROM
-//	unified_order_goods uog
-//	LEFT JOIN unified_order uo ON uog.order_sn = uo.order_sn
-//	WHERE uo.order_sn in (
-//			SELECT order_sn FROM `accounting_unified_supplier_order_jd_check_up_report` WHERE process_result = 1 and batch_id = '1450042895204749312'
-//	)
-
-
-//	19985
-//	SELECT
-//	uo.id as unified_order_id,
-//	uog.id as unified_order_goods_id
-//			FROM
-//	unified_order_goods uog
-//	LEFT JOIN unified_order uo ON uog.order_sn = uo.order_sn
-//	WHERE uo.order_sn in (
-//			SELECT order_sn FROM `accounting_unified_supplier_order_jd_check_up_report` WHERE process_result = 1 and batch_id = '1450042895204749312'
-//	) or uo.refund_order_sn in (
-//			SELECT order_sn FROM `accounting_unified_supplier_order_jd_check_up_report` WHERE process_result = 1 and batch_id = '1450042895204749312'
-//	)
-
-    /****************************************** 检查   end ******************************************/
-
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.java

@@ -1,128 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd;
-
-import cn.hutool.core.date.DateTime;
-import cn.superdesk.uniorder.common.enums.accounting.AccountingOrderDimCreateByEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskCheckStateEnum;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.base.UnifiedOrder;
-import cn.superdesk.uniorder.dao.entity.base.UnifiedOrderGoods;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoods;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimGoods;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsHeadVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVoWoof;
-import cn.superdesk.uniorder.service.base.BaseService;
-import com.github.pagehelper.PageInfo;
-
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * @Description:
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2022-06-22 16:27:47
- * @UpdateUser: linjinyu
- * @UpdateDate: 2022-06-22 16:27:47
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-public interface AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService extends BaseService<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> {
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    @Override
-    int insertSelective(AccountingUnifiedSupplierOrderJdCheckUpReportXGoods entity);
-
-    int insertBatch(List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> processList);
-
-    @Override
-    int updateByPrimaryKeySelective(AccountingUnifiedSupplierOrderJdCheckUpReportXGoods entity);
-
-    @Override
-    @Deprecated
-    void deleteObj(Long id);
-
-    @Override
-    AccountingUnifiedSupplierOrderJdCheckUpReportXGoods findById(Long id);
-
-    @Override
-    @Deprecated
-    PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize);
-
-    @Override
-    @Deprecated
-    List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> findAll(Map<String, Object> queryMap);
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    /****************************************** Biz 部分 部分 start ******************************************/
-
-    int addAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam param, LoginSysUser loginSysUser);
-
-    int updateAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam param, LoginSysUser loginSysUser);
-
-    int deleteAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(Long id, LoginSysUser loginSysUser);
-
-    AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo findListItemVoById(Long id, LoginSysUser loginSysUser);
-
-    R<List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize);
-
-    R<List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo>> pageQueryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria criteria,
-            LoginSysUser loginSysUser);
-
-    AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsHeadVo queryHeadGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser);
-
-    List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo> queryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria criteria,
-            LoginSysUser loginSysUser);
-
-    List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVoWoof> queryGenericWoof(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria);
-
-    Map<Long, List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVoWoof>> mapQueryGenericWoof(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria);
-
-    /****************************************** Biz 部分   end ******************************************/
-
-    List<AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimGoods> simulateGoodsSelected(String batchId, Integer processResult);
-
-
-//    predicatesUnifiedOrderByFieldCompletStateEq1Filter,
-//    predicatesUnifiedOrderGoodsByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter,
-    int insertXBySingleOrder(
-            String batchId,
-            Long accountingUnifiedSupplierOrderJdId,
-            UnifiedOrder orderFromDB,
-            List<UnifiedOrder> orderAsWholeListFromDB,
-            List<UnifiedOrder> predicatesUnifiedOrderByFieldCompletStateEq1Filter,
-            List<UnifiedOrderGoods> predicatesUnifiedOrderGoodsByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter,
-            AccountingOrderDimCreateByEnum dimCreateByEnum,
-            ScheduleTaskCheckStateEnum checkStateEnum,
-            DateTime now);
-
-//    int nullOrInsertXBySingleOrder(String batchId, UnifiedOrder orderFromDB);
-
-    int lockXBySingleOrder(String batchId,
-                           UnifiedOrder orderFromDB,
-                           List<UnifiedOrder> orderAsWholeListFromDB,
-                           List<UnifiedOrder> predicatesByFieldCompletStateEq1Filter,
-                           List<UnifiedOrderGoods> predicatesByAccountingStateSupplierEq2Filter);
-
-    int lockXByBatchId(String batchId);
-
-
-    int unLockXByBatchId(String batchId);
-
-    int deleeteXByBatchId(String batchId);
-
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/AccountingUnifiedSupplierOrderJdExportExcelService.java

@@ -1,24 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd;
-
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdListItemVo;
-
-import java.util.List;
-
-/**
- * @Description: Java类作用描述
- * @Author: linjinyu
- * @CreateDate: 2022/6/10 2:09 下午
- * @UpdateUser: linjinyu
- * @UpdateDate: 2022/6/10 2:09 下午
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-public interface AccountingUnifiedSupplierOrderJdExportExcelService {
-
-    SysNotify exportExcelJdImportRecord(
-            List<AccountingUnifiedSupplierOrderJdListItemVo> resultList,
-            String batchId,
-            LoginSysUser loginSysUser);
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/AccountingUnifiedSupplierOrderJdService.java

@@ -1,126 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd;
-
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJd;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdQueryCriteria;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdDetailStatisticsVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdListItemVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdUpperLevelsStatisticsVo;
-import cn.superdesk.uniorder.service.base.BaseService;
-import com.github.pagehelper.PageInfo;
-
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * @Description: 京东对账单中的订单 算是临时 sheet eg 深圳市侨城汇网络科技有限公司-2021年8月1日集采账单.xlsx
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-12 11:29:24
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-12 11:29:24
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-public interface AccountingUnifiedSupplierOrderJdService extends BaseService<AccountingUnifiedSupplierOrderJd> {
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    int insertSelective(AccountingUnifiedSupplierOrderJd entity);
-
-    int updateByPrimaryKeySelective(AccountingUnifiedSupplierOrderJd entity);
-
-    @Deprecated
-    void deleteObj(Long id);
-
-    @Deprecated
-    AccountingUnifiedSupplierOrderJd findById(Long id);
-
-    AccountingUnifiedSupplierOrderJd findByBatchIdAndJdOrderSn(String batchId, String jdOrderSn);
-
-    @Deprecated
-    PageInfo<AccountingUnifiedSupplierOrderJd> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize);
-
-    @Deprecated
-    List<AccountingUnifiedSupplierOrderJd> findAll(Map<String, Object> queryMap);
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    void addAccountingUnifiedSupplierOrderJd(AccountingUnifiedSupplierOrderJd entity);
-
-    void updateAccountingUnifiedSupplierOrderJd(AccountingUnifiedSupplierOrderJd entity);
-
-    void updateAccountingUnifiedSupplierOrderJdByPrimaryKeySelective(AccountingUnifiedSupplierOrderJd entity);
-
-    void deleteAccountingUnifiedSupplierOrderJd(Long id);
-
-    int deleteByBatchId(String batchId);
-
-    AccountingUnifiedSupplierOrderJd findAccountingUnifiedSupplierOrderJdById(Long id);
-
-    R<List<AccountingUnifiedSupplierOrderJd>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize);
-
-    R<List<AccountingUnifiedSupplierOrderJdListItemVo>> pageQueryGenericParam(
-            AccountingUnifiedSupplierOrderJdQueryCriteria criteria,
-            LoginSysUser loginSysUser);
-
-    List<AccountingUnifiedSupplierOrderJdListItemVo> queryGenericParam(
-            AccountingUnifiedSupplierOrderJdQueryCriteria criteria,
-            LoginSysUser loginSysUser);
-
-    AccountingUnifiedSupplierOrderJdDetailStatisticsVo pageQueryHeadGenericParam(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser);
-
-    AccountingUnifiedSupplierOrderJdUpperLevelsStatisticsVo statisticsQuantityDimOrderNormalOrException(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria, LoginSysUser loginSysUser);
-
-
-    /****************************************** excel import start start ******************************************/
-
-    SysNotify opImportExcelFullVersion(SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form, LoginSysUser loginSysUser);
-
-    SysNotify opImportExcelLiteVersion(SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form, LoginSysUser loginSysUser);
-
-    void saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRow(
-            AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow excelRow,
-            LoginSysUser loginSysUser);
-
-    void saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRowList(
-            List<AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow> excelRowList,
-            LoginSysUser loginSysUser);
-
-    int insertBatch4ThirdPartJdReconciliationScheduleFullVersionExcelRowList(
-            List<AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow> excelRowList,
-            LoginSysUser loginSysUser);
-
-    int insertBatch(List<AccountingUnifiedSupplierOrderJd> processList);
-
-    int replaceBatch(List<AccountingUnifiedSupplierOrderJd> processList);
-
-    void basisCheckUpForV2_5(AccountingUnifiedSupplierOrderJd entity);
-
-    void saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRow(
-            AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow excelRow,
-            LoginSysUser loginSysUser);
-
-    void saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRowList(
-            List<AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow> excelRowList,
-            LoginSysUser loginSysUser);
-
-    int insertBatch4ThirdPartJdReconciliationScheduleLiteVersionExcelRowList(
-            List<AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow> excelRowList,
-            LoginSysUser loginSysUser);
-
-    /****************************************** excel import start   end ******************************************/
-
-
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/SysQuartzScheduleTaskStatementOfAccountJdExOpPartService.java

@@ -1,25 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd;
-
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpCancelForm;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpConfirmForm;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpDeleteForm;
-
-/**
- * @Description: 开票申请 发票管理
- * @Author: linjinyu 重构
- * @CreateDate: 7/28/20 7:52 PM
- * @UpdateUser: linjinyu
- * @UpdateDate: 7/28/20 7:52 PM
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-public interface SysQuartzScheduleTaskStatementOfAccountJdExOpPartService {
-
-
-	int opDelete(SysQuartzScheduleTaskStatementOfAccountJdOpDeleteForm form, LoginSysUser loginSysUser);
-
-	int opCancel(SysQuartzScheduleTaskStatementOfAccountJdOpCancelForm form, LoginSysUser loginSysUser);
-
-	int opConfirm(SysQuartzScheduleTaskStatementOfAccountJdOpConfirmForm form, LoginSysUser loginSysUser);
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/SysQuartzScheduleTaskStatementOfAccountJdService.java

@@ -1,143 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd;
-
-
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskAccountingStatusEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskCheckStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskProcessStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskRunStatusEnum;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJd;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdParam;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdHeadVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdListItemVo;
-import cn.superdesk.uniorder.service.base.BaseService;
-import com.github.pagehelper.PageInfo;
-
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * @Description: 定时任务-时刻任务-对账单
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-12 11:29:24
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-12 11:29:24
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-public interface SysQuartzScheduleTaskStatementOfAccountJdService extends BaseService<SysQuartzScheduleTaskStatementOfAccountJd> {
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    @Override
-    int insertSelective(SysQuartzScheduleTaskStatementOfAccountJd entity);
-
-    @Override
-    int updateByPrimaryKeySelective(SysQuartzScheduleTaskStatementOfAccountJd entity);
-
-    int updateByBatchIdSelective(SysQuartzScheduleTaskStatementOfAccountJd entity);
-
-    @Override
-    @Deprecated
-    void deleteObj(Long id);
-
-    @Override
-    SysQuartzScheduleTaskStatementOfAccountJd findById(Long id);
-
-    SysQuartzScheduleTaskStatementOfAccountJd findByBatchId(String batchId);
-
-    @Override
-    @Deprecated
-    PageInfo<SysQuartzScheduleTaskStatementOfAccountJd> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize);
-
-    @Override
-    @Deprecated
-    List<SysQuartzScheduleTaskStatementOfAccountJd> findAll(Map<String, Object> queryMap);
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    int addSysQuartzScheduleTaskStatementOfAccountJd(SysQuartzScheduleTaskStatementOfAccountJdParam param, LoginSysUser loginSysUser);
-
-    int updateSysQuartzScheduleTaskStatementOfAccountJd(SysQuartzScheduleTaskStatementOfAccountJdParam param, LoginSysUser loginSysUser);
-
-    int deleteSysQuartzScheduleTaskStatementOfAccountJd(Long id, LoginSysUser loginSysUser);
-
-    SysQuartzScheduleTaskStatementOfAccountJdListItemVo findListItemVoById(Long id, LoginSysUser loginSysUser);
-
-    SysQuartzScheduleTaskStatementOfAccountJdListItemVo findListItemVoByBatchId(String batchId, LoginSysUser loginSysUser);
-
-    R<List<SysQuartzScheduleTaskStatementOfAccountJd>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize);
-
-    R<List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo>> pageQueryGenericParam(
-            SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria criteria,
-            LoginSysUser loginSysUser);
-
-    SysQuartzScheduleTaskStatementOfAccountJdHeadVo queryHeadGenericParam(
-            SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser);
-
-    List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> queryGenericParam(
-            SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria criteria,
-            LoginSysUser loginSysUser);
-
-    SysQuartzScheduleTaskStatementOfAccountJdListItemVo getListItemVoByBatchId(String batchId, LoginSysUser loginSysUser);
-
-
-    /**************************************** 任务牵引方法 懒得做状态机 start ****************************************/
-
-    int towImportExcel(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            ScheduleTaskRunStatusEnum runStatusEnum,
-            ScheduleTaskProcessStateEnum processStateEnum,
-            LoginSysUser loginSysUser);
-
-    int towCompareOrderAndCheckUpThenReport(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            ScheduleTaskRunStatusEnum runStatusEnum,
-            ScheduleTaskAccountingStatusEnum accountingStatusEnum,
-            LoginSysUser loginSysUser);
-
-    int towCompareOrderAndCheckUpThenReportThrowException(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            ScheduleTaskRunStatusEnum runStatusEnum,
-            ScheduleTaskAccountingStatusEnum accountingStatusEnum,
-            ScheduleTaskCheckStateEnum checkStateEnum,
-            LoginSysUser loginSysUser);
-
-    SysQuartzScheduleTaskStatementOfAccountJdListItemVo deQueueOneImportExcel(LoginSysUser loginSysUser);
-
-    SysQuartzScheduleTaskStatementOfAccountJdListItemVo deQueueOneCompareOrderAndCheckUpThenReport(LoginSysUser loginSysUser);
-
-
-    /**************************************** 任务牵引方法 懒得做状态机   end ****************************************/
-
-    /**************************************** 任务调度方法 start ****************************************/
-
-    SysNotify dispatcherExcelImportLiteVersion(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser);
-
-    SysNotify dispatcherExcelImportFullVersion(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser);
-
-    SysNotify dispatcherCompareOrderAndCheckUpThenReport(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser);
-
-    SysNotify dispatcherCompareOrderAndCheckUpThenReportOnlyException(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser);
-
-    /**************************************** 任务调度方法 start ****************************************/
-
-
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelCellWriteHandler.java

@@ -1,82 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.metadata.CellData;
-import com.alibaba.excel.metadata.Head;
-import com.alibaba.excel.write.handler.AbstractCellWriteHandler;
-import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
-import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-
-import java.util.List;
-
-/**
- * @Description: excel 公式
- * @Author: linjinyu
- * @CreateDate: 2021/11/8 下午3:18
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021/11/8 下午3:18
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-public class AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelCellWriteHandler extends AbstractCellWriteHandler {
-
-	@Override
-	public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row,
-	                             Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) {
-
-
-	}
-
-	@Override
-	public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell,
-	                            Head head, Integer relativeRowIndex, Boolean isHead) {
-
-		// 这里可以对cell进行任何操作
-//			log.info("第 {} 行,第 {} 列 数据...", cell.getRowIndex(), cell.getColumnIndex());
-	}
-
-	@Override
-	public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, CellData cellData, Cell cell, Head head, Integer integer, Boolean aBoolean) {
-
-	}
-
-	@Override
-	public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
-	                             List<CellData> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
-
-		// 这里可以对cell进行任何操作
-		log.info("afterCellDispose 第 {} 行,第 {} 列 数据...", cell.getRowIndex(), cell.getColumnIndex());
-
-		// 结算金额(订单)N
-		if (cell.getRowIndex() >= 1 && 13 == cell.getColumnIndex()) {
-
-			// 结算金额(订单)N = 订单金额(订单)H + 退款金额(订单)I * 商户承担运费(订单)K
-			// 以第1行数据为例:N1 = H1 + I1 + K1
-			int actualCellRowNum01 = cell.getRowIndex();
-
-			String formulaStr01 = StrUtil.format("=H{}+I{}+K{}", actualCellRowNum01, actualCellRowNum01, actualCellRowNum01);
-			cell.setCellFormula(formulaStr01);
-
-			log.info("第{}行,第{}列 公式 {} 完成", cell.getRowIndex(), cell.getColumnIndex(), formulaStr01);
-		}
-
-		// 结算金额(商品)O
-		if (cell.getRowIndex() >= 1 && 14 == cell.getColumnIndex()) {
-
-			// 结算金额(订单)N = 订单金额(订单)H + 退款金额(订单)I * 商户承担运费(订单)K
-			// 以第1行数据为例:O1 = L1 + M1 + K1
-			int actualCellRowNum02 = cell.getRowIndex();
-
-			String formulaStr02 = StrUtil.format("=L{}+M{}+K{}", actualCellRowNum02, actualCellRowNum02, actualCellRowNum02);
-			cell.setCellFormula(formulaStr02);
-
-			log.info("第{}行,第{}列 公式 {} 完成", cell.getRowIndex(), cell.getColumnIndex(), formulaStr02);
-		}
-	}
-
-	/****************************************** 填充公式   end ******************************************/
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelJdCheckReportLiteVersionMergeStrategy.java

@@ -1,202 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl;
-
-import com.alibaba.excel.metadata.CellData;
-import com.alibaba.excel.metadata.Head;
-import com.alibaba.excel.write.handler.CellWriteHandler;
-import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
-import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellType;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.util.CellRangeAddress;
-
-import java.util.List;
-
-/**
- * @Description: Java类作用描述
- * @Author: linjinyu
- * @CreateDate: 2022/6/28 12:43 下午
- * @UpdateUser: linjinyu
- * @UpdateDate: 2022/6/28 12:43 下午
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Data
-public class AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelJdCheckReportLiteVersionMergeStrategy implements CellWriteHandler {
-
-    /**
-     * 合并字段的下标
-     */
-    private int[] mergeColumnIndex;
-    /**
-     * 合并从第几行开始
-     */
-    private int   mergeRowIndex;
-    /**
-     * 参考例
-     */
-    private int   referColumnIndex = -1;
-
-    public AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelJdCheckReportLiteVersionMergeStrategy(
-            int mergeRowIndex,
-            int[] mergeColumnIndex
-    ) {
-        this.mergeRowIndex = mergeRowIndex;
-        this.mergeColumnIndex = mergeColumnIndex;
-
-        log.info("\nAccountingUnifiedSupplierOrderJdExportExcelJdImportRecordMergeStrategy start " +
-                        "mergeRowIndex {}" +
-                        "mergeColumnIndex {}" +
-                        "\nAccountingUnifiedSupplierOrderJdExportExcelJdImportRecordMergeStrategy   end",
-                mergeRowIndex, mergeColumnIndex
-        );
-    }
-
-    public AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelJdCheckReportLiteVersionMergeStrategy(
-            int mergeRowIndex,
-            int[] mergeColumnIndex,
-            int referColumnIndex
-    ) {
-        this.mergeRowIndex = mergeRowIndex;
-        this.mergeColumnIndex = mergeColumnIndex;
-        this.referColumnIndex = referColumnIndex;
-
-        log.info("\nAccountingUnifiedSupplierOrderJdExportExcelJdImportRecordMergeStrategy start " +
-                        "mergeRowIndex {}" +
-                        "mergeColumnIndex {}" +
-                        "\nAccountingUnifiedSupplierOrderJdExportExcelJdImportRecordMergeStrategy   end",
-                mergeRowIndex, mergeColumnIndex
-        );
-    }
-
-    @Override
-    public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row,
-                                 Head head, Integer integer, Integer integer1, Boolean aBoolean) {
-
-    }
-
-    @Override
-    public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell,
-                                Head head, Integer integer, Boolean aBoolean) {
-
-    }
-
-
-    public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
-                                       CellData cellData, Cell cell, Head head, Integer integer, Boolean aBoolean) {
-
-    }
-
-    @Override
-    public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
-                                 List<CellData> list, Cell cell, Head head, Integer integer, Boolean aBoolean) {
-        // 当前行
-        int curRowIndex = cell.getRowIndex();
-        // 当前列
-        int curColIndex = cell.getColumnIndex();
-
-        if (curRowIndex > mergeRowIndex) {
-
-            log.info("\nlist:{}\ncell:{}", list, cell);
-
-            for (int i = 0; i < mergeColumnIndex.length; i++) {
-
-                if (curColIndex == mergeColumnIndex[i]) {
-
-                    if (referColumnIndex == -1) {
-                        mergeWithPrevRow(writeSheetHolder, cell, curRowIndex, curColIndex);
-                    }
-                    if (referColumnIndex != -1) {
-                        mergeWithPrevRowForReferColumnIndex(writeSheetHolder, cell, curRowIndex, curColIndex, referColumnIndex);
-                    }
-
-                    break;
-                }
-            }
-        }
-
-    }
-
-    private void mergeWithPrevRow(WriteSheetHolder writeSheetHolder, Cell curCell, int curRowIndex, int curColIndex) {
-
-        // 获取当前行的当前列的数据和上一行的当前列列数据，通过上一行数据是否相同进行合并
-        // Cell   curCell = cell;
-        Cell   preCell = curCell.getSheet().getRow(curRowIndex - 1).getCell(curColIndex);
-        Object curData = curCell.getCellTypeEnum() == CellType.STRING ? curCell.getStringCellValue() : curCell.getNumericCellValue();
-        Object preData = preCell.getCellTypeEnum() == CellType.STRING ? preCell.getStringCellValue() : preCell.getNumericCellValue();
-
-        // 比较当前行的第一列的单元格与上一行是否相同，相同合并当前单元格与上一行
-        if (curData.equals(preData)) {
-
-            Sheet sheet = writeSheetHolder.getSheet();
-
-            List<CellRangeAddress> mergeRegions = sheet.getMergedRegions();
-
-            boolean isMerged = false;
-
-            for (int i = 0; i < mergeRegions.size() && !isMerged; i++) {
-
-                CellRangeAddress cellRangeAddr = mergeRegions.get(i);
-
-                // 若上一个单元格已经被合并，则先移出原有的合并单元，再重新添加合并单元
-                if (cellRangeAddr.isInRange(curRowIndex - 1, curColIndex)) {
-                    sheet.removeMergedRegion(i);
-                    cellRangeAddr.setLastRow(curRowIndex);
-                    sheet.addMergedRegion(cellRangeAddr);
-                    isMerged = true;
-                }
-            }
-
-            // 若上一个单元格未被合并，则新增合并单元
-            if (!isMerged) {
-                CellRangeAddress cellRangeAddress = new CellRangeAddress(curRowIndex - 1, curRowIndex, curColIndex, curColIndex);
-                sheet.addMergedRegion(cellRangeAddress);
-            }
-        }
-    }
-
-    private void mergeWithPrevRowForReferColumnIndex(WriteSheetHolder writeSheetHolder, Cell cell, int curRowIndex, int curColIndex, int referColumnIndex) {
-
-
-        Cell curCell = cell.getSheet().getRow(curRowIndex).getCell(referColumnIndex);
-        Cell preCell = cell.getSheet().getRow(curRowIndex - 1).getCell(referColumnIndex);
-
-        Object curReferData = curCell.getCellTypeEnum() == CellType.STRING ? curCell.getStringCellValue() : curCell.getNumericCellValue();
-        Object preReferData = preCell.getCellTypeEnum() == CellType.STRING ? preCell.getStringCellValue() : preCell.getNumericCellValue();
-
-
-        // 比较当前行的第一列的单元格与上一行是否相同，相同合并当前单元格与上一行
-        if (curReferData.equals(preReferData)) {
-
-            Sheet sheet = writeSheetHolder.getSheet();
-
-            List<CellRangeAddress> mergeRegions = sheet.getMergedRegions();
-
-            boolean isMerged = false;
-
-            for (int i = 0; i < mergeRegions.size() && !isMerged; i++) {
-
-                CellRangeAddress cellRangeAddr = mergeRegions.get(i);
-
-                // 若上一个单元格已经被合并，则先移出原有的合并单元，再重新添加合并单元
-                if (cellRangeAddr.isInRange(curRowIndex - 1, curColIndex)) {
-                    sheet.removeMergedRegion(i);
-                    cellRangeAddr.setLastRow(curRowIndex);
-                    sheet.addMergedRegion(cellRangeAddr);
-                    isMerged = true;
-                }
-            }
-
-            // 若上一个单元格未被合并，则新增合并单元
-            if (!isMerged) {
-                CellRangeAddress cellRangeAddress = new CellRangeAddress(curRowIndex - 1, curRowIndex, curColIndex, curColIndex);
-                sheet.addMergedRegion(cellRangeAddress);
-            }
-        }
-    }
-}
-

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRowWriteHandler.java

@@ -1,188 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl;
-
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.write.handler.AbstractRowWriteHandler;
-import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
-import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
-import org.apache.poi.xssf.usermodel.XSSFRichTextString;
-
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * @Description: 自定义拦截器-注解定义, Excel Cell 批注反馈
- * 校验模式:
- * 1. 快速失败返回模式
- * 2. 普通模式
- * 反馈模式:
- * 1. 批注-错误的Cell
- * 2. 行尾-添加两列[结果,报告]
- * @Author: linjinyu
- * @CreateDate: 2021/8/24 上午11:14
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021/8/24 上午11:14
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-public class AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRowWriteHandler extends AbstractRowWriteHandler {
-
-
-	@Override
-	public void beforeRowCreate(WriteSheetHolder writeSheetHolder,
-	                            WriteTableHolder writeTableHolder,
-	                            Integer rowIndex,
-	                            Integer relativeRowIndex,
-	                            Boolean isHead) {
-
-//		ClassUtils.declaredFields(headClazz, sortedAllFiledMap, indexFiledMap, ignoreMap, convertAllFiled, needIgnore, writeSheetHolder);
-//		log.info("ExcelImportExportAddPostilRowWriteHandler\nbeforeRowCreate\n{}", JsonUtils.toJson(sortedAllFiledMap));
-		log.info("beforeRowCreate {} isHead {}", relativeRowIndex, isHead);
-
-	}
-
-	@Override
-	public void afterRowCreate(WriteSheetHolder writeSheetHolder,
-	                           WriteTableHolder writeTableHolder,
-	                           Row row,
-	                           Integer relativeRowIndex,
-	                           Boolean isHead) {
-		log.info("afterRowCreate {} isHead {}", relativeRowIndex, isHead);
-	}
-
-	@Override
-	public void afterRowDispose(WriteSheetHolder writeSheetHolder,
-	                            WriteTableHolder writeTableHolder,
-	                            Row row /* POI的东西 */,
-	                            Integer relativeRowIndex,
-	                            Boolean isHead) {
-
-		log.info("afterRowDispose [{}] start", relativeRowIndex);
-
-		// 如果false 就读取行数据.
-		if (!isHead) {
-
-			Cell cellN13 = row.getCell(13);
-			// 结算金额(订单)N = 订单金额(订单)H + 退款金额(订单)I * 商户承担运费(订单)K
-			// 以第1行数据为例:N1 = H1 + I1 + K1
-			int actualCellRowNum01 = cellN13.getRowIndex();
-			String formulaStr01 = StrUtil.format("H{}+I{}+K{}", actualCellRowNum01, actualCellRowNum01, actualCellRowNum01);
-			cellN13.setCellFormula(formulaStr01);
-
-			log.info("第{}行,第{}列 公式 {} 完成", cellN13.getRowIndex(), cellN13.getColumnIndex(), formulaStr01);
-
-
-			Cell cellO14 = row.getCell(14);
-			// 结算金额(订单)O = 订单金额(商品)L + 退款金额(商品)M * 商户承担运费(订单)K
-			// 以第1行数据为例:O1 = L1 + M1 + K1
-			int actualCellRowNum02 = cellO14.getRowIndex();
-			String formulaStr02 = StrUtil.format("L{}+M{}+K{}", actualCellRowNum02, actualCellRowNum02, actualCellRowNum02);
-			cellO14.setCellFormula(formulaStr02);
-
-			log.info("第{}行,第{}列 写入公式完成", cellO14.getRowIndex(), cellO14.getColumnIndex());
-
-		}
-	}
-
-	private void setReport(StringBuffer reportStrBuf, Sheet sheet, Integer relativeRowIndex, Integer relativeCellIndex, String msg) {
-
-		reportStrBuf.append(StrUtil.format("R[{}]C[{}]ERROR[{}]\n", relativeRowIndex, relativeCellIndex, msg));
-	}
-
-	private void setPostil(Sheet sheet, Integer relativeRowIndex, Integer relativeCellIndex, String msg) {
-
-		Workbook workbook = sheet.getWorkbook();
-
-		CellStyle cellStyle = workbook.createCellStyle();
-		// 设置前景填充样式
-		cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
-		// 设置前景色为黄色
-		cellStyle.setFillForegroundColor(IndexedColors.YELLOW.getIndex());
-		//设置垂直居中
-		cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
-
-		Drawing<?> drawingPatriarch = sheet.createDrawingPatriarch();
-
-		// 在第一行 第二列创建一个批注
-		Comment comment = drawingPatriarch.createCellComment(new XSSFClientAnchor(0, 0, 0, 0, (short) 3, 3, (short) 5, 6));
-		// 输入批注信息
-		comment.setString(new XSSFRichTextString(msg));
-
-//		// 将批注添加到单元格对象中 对空处理的话是需要创建的 createCell
-//		sheet.getRow(relativeRowIndex + 1).createCell(relativeCellIndex).setCellComment(comment);
-//		sheet.getRow(relativeRowIndex + 1).createCell(relativeCellIndex).setCellStyle(cellStyle);
-
-		sheet.getRow(relativeRowIndex + 1).getCell(relativeCellIndex).setCellComment(comment);
-		sheet.getRow(relativeRowIndex + 1).getCell(relativeCellIndex).setCellStyle(cellStyle);
-	}
-
-
-	// 判断Excel导入的数据类型,转换成数据库可识别的数据类型
-	@Deprecated
-	private String getCellTypes(Cell cell) {
-
-		String cellValue = null;
-
-		if (null != cell) {
-
-			// 以下是判断数据的类型
-			switch (cell.getCellType()) {
-				case HSSFCell.CELL_TYPE_NUMERIC: // 数字
-					// 处理日期格式、时间格式
-					if (HSSFDateUtil.isCellDateFormatted(cell)) {
-						Date       d        = cell.getDateCellValue();
-						DateFormat formater = new SimpleDateFormat("yyyy-MM-dd");
-						cellValue = formater.format(d);
-					} else {
-						cellValue = cell.getNumericCellValue() + "";
-					}
-
-
-					break;
-				// 字符串
-				case HSSFCell.CELL_TYPE_STRING:
-					cellValue = cell.getStringCellValue();
-					break;
-				// Boolean
-				case HSSFCell.CELL_TYPE_BOOLEAN:
-					cellValue = cell.getBooleanCellValue() + "";
-					break;
-				// 公式
-				case HSSFCell.CELL_TYPE_FORMULA:
-					// cellValue = cell.getCellFormula() + "";
-					try {
-						DecimalFormat df = new DecimalFormat("0.0000");
-						cellValue = String.valueOf(df.format(cell.getNumericCellValue()));
-
-					} catch (IllegalStateException e) {
-						cellValue = String.valueOf(cell.getRichStringCellValue());
-					}
-
-					break;
-				// 空值
-				case HSSFCell.CELL_TYPE_BLANK:
-					cellValue = "";
-					break;
-				// 故障
-				case HSSFCell.CELL_TYPE_ERROR:
-					cellValue = "非法字符";
-					break;
-
-				default:
-					cellValue = "未知类型";
-					break;
-			}
-		}
-		return cellValue;
-	}
-}
-
-
-

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelServiceImpl.java

@@ -1,275 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.superdesk.uniorder.common.enums.common.CommonProcessResultEnum;
-import cn.superdesk.uniorder.common.enums.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountRunStateEnum;
-import cn.superdesk.uniorder.common.excel.ExcelResponse;
-import cn.superdesk.uniorder.common.excel.strategy.style.EasyExcelCustomCellWriteHandler;
-import cn.superdesk.uniorder.common.excel.strategy.style.EasyExcelWriteHandlerCellStyleUtils;
-import cn.superdesk.uniorder.common.numerical.AnBeanUtils;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dto._constant.ResourceConstant;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRow;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo;
-import cn.superdesk.uniorder.notify.NotifyUtils;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelService;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * @Description: Java类作用描述
- * @Author: linjinyu
- * @CreateDate: 2021/11/5 上午11:29
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021/11/5 上午11:29
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Service
-public class AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelServiceImpl
-        implements AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelService {
-
-    @Autowired
-    private ResourceConstant resourceConstant;
-
-    private static final String TEMPLATE_EXCEL_EXPORT_ACCOUNTING_UNIFIED_SUPPLIER_ORDER_JD_CHECKUP_REPORT_FULL_VERSION = "exportExcelJdCheckUpReport_FullVersion_v20211108.xlsx";
-    private static final String TEMPLATE_EXCEL_EXPORT_ACCOUNTING_UNIFIED_SUPPLIER_ORDER_JD_CHECKUP_REPORT_LITE_VERSION = "exportExcelJdCheckUpReport_LiteVersion_v20220614.xlsx";
-
-
-    @Override
-    public SysNotify exportExcelJdCheckUpReportFullVersion(List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> resultList, String batchId, LoginSysUser loginSysUser) {
-
-
-        String excelExportPathRoot             = resourceConstant.getPathRoot();
-        String excelExportRelativePathTemplate = resourceConstant.getPathTemplate();
-        String excelExportRelativePathStorage  = resourceConstant.getPathStorage();
-
-        String relativePath = File.separator + "excel" +
-                File.separator + "accounting" +
-                File.separator + "score" +
-                File.separator + "jd" +
-                File.separator;
-
-        String templateRelativePath = excelExportPathRoot + excelExportRelativePathTemplate + relativePath;
-        String templateFullPath;
-
-        String targetFullPath = excelExportPathRoot + excelExportRelativePathStorage;
-
-        String targetFileName          = "京东对账" + "_" + "比对报告_" + batchId + ExcelResponse.addTail() + ".xlsx";
-        String targetWriteFileFullPath = targetFullPath + relativePath + targetFileName;
-
-//		if (!FileUtil.exist(targetWriteFileFullPath)) {
-//			FileUtil.mkdir(targetWriteFileFullPath);
-//		}
-        FileUtil.touch(targetWriteFileFullPath);
-
-
-        templateFullPath = templateRelativePath + TEMPLATE_EXCEL_EXPORT_ACCOUNTING_UNIFIED_SUPPLIER_ORDER_JD_CHECKUP_REPORT_FULL_VERSION;
-
-        ExcelWriter excelWriter = EasyExcel
-                .write(targetWriteFileFullPath)
-//				.inMemory(Boolean.TRUE)
-//				.withTemplate(templateFullPath)
-                .head(AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRow.class)
-                .build();
-
-        WriteSheet writeSheet0 = EasyExcel
-                .writerSheet(0)
-//				.registerWriteHandler(new AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelCellWriteHandler())
-//				.registerWriteHandler(new AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRowWriteHandler())
-                .build();
-
-//		FillConfig fillConfig  = FillConfig.builder().forceNewRow(Boolean.FALSE).build();
-
-        log.info("\n{}\n{}\n{}", templateFullPath, targetWriteFileFullPath, resultList.size());
-
-        // 转换数据 AccountingUnifiedSupplierOrderJdCheckUpReport -> AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRow
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRow> convertResultList = convertAccountingUnifiedSupplierOrderJdCheckUpReport2AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRow(resultList);
-
-        // 数据填充
-//		excelWriter.fill(new FillWrapper("detail", resultList), fillConfig, writeSheet0);
-//		excelWriter.fill(new FillWrapper("detail", resultList), writeSheet0);
-//		excelWriter.fill(convertResultList, writeSheet0);
-
-        excelWriter
-                .write(convertResultList, writeSheet0);
-
-        // 设置强制计算公式:不然公式会以字符串的形式显示在excel中
-//		Workbook workbook = excelWriter.writeContext().writeWorkbookHolder().getWorkbook();
-//		workbook.setForceFormulaRecalculation(true);
-
-        // 别忘记关闭流
-        excelWriter
-                .finish();
-
-        return NotifyUtils.createSysNotify(
-                targetFileName,
-                relativePath + targetFileName,
-                SysQuartzScheduleTaskStatementOfAccountRunStateEnum.成功
-        );
-
-    }
-
-    @Override
-    public SysNotify exportExcelJdCheckUpReportLiteVersion(
-            List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> resultList,
-            String batchId,
-            LoginSysUser loginSysUser) {
-
-
-        String excelExportPathRoot             = resourceConstant.getPathRoot();
-        String excelExportRelativePathTemplate = resourceConstant.getPathTemplate();
-        String excelExportRelativePathStorage  = resourceConstant.getPathStorage();
-
-        String relativePath = File.separator + "excel" +
-                File.separator + "accounting" +
-                File.separator + "score" +
-                File.separator + "jd" +
-                File.separator;
-
-        String templateRelativePath = excelExportPathRoot + excelExportRelativePathTemplate + relativePath;
-        String templateFullPath;
-
-        String targetFullPath = excelExportPathRoot + excelExportRelativePathStorage;
-
-        String targetFileName          = "京东对账" + "_" + "比对报告_" + batchId + ExcelResponse.addTail() + ".xlsx";
-        String targetWriteFileFullPath = targetFullPath + relativePath + targetFileName;
-
-//		if (!FileUtil.exist(targetWriteFileFullPath)) {
-//			FileUtil.mkdir(targetWriteFileFullPath);
-//		}
-        FileUtil.touch(targetWriteFileFullPath);
-
-
-        templateFullPath = templateRelativePath + TEMPLATE_EXCEL_EXPORT_ACCOUNTING_UNIFIED_SUPPLIER_ORDER_JD_CHECKUP_REPORT_LITE_VERSION;
-
-        /**************************************** fill start ****************************************/
-
-//        ExcelWriterBuilder excelWriterBuilder = EasyExcel
-//                .write(targetWriteFileFullPath);
-//        ExcelWriter excelWriter = null;
-//
-//        WriteSheet writeSheet0 = EasyExcel
-//                .writerSheet(0, "列表")
-//                .build();
-//        FillConfig fillConfig = FillConfig
-//                .builder()
-//                .forceNewRow(Boolean.FALSE)
-//                .build();
-//
-//        excelWriter = excelWriterBuilder
-//                .withTemplate(templateFullPath)
-//                .build();
-//        excelWriter
-//                .fill(new FillWrapper("detail", resultList), fillConfig, writeSheet0);
-//
-//        // 别忘记关闭流
-//        excelWriter
-//                .finish();
-
-        /**************************************** fill   end ****************************************/
-
-        final List<Integer> mergeColumnIndex = new ArrayList<Integer>() {
-            {
-                add(0);
-                add(1);
-                add(2);
-//                add(3);
-//                add(4);
-                add(5);
-                add(6);
-                add(7);
-                add(8);
-            }
-        };
-
-        EasyExcel
-                .write(targetWriteFileFullPath, AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo.class)
-                .needHead(Boolean.TRUE)
-                .includeColumnFiledNames(Arrays.asList(
-                        "accountingUnifiedSupplierOrderJdId",
-                        "jdOrderSn",
-                        "jdOrderAmount",
-                        "goddogOrderSn",
-                        "goodsCostPriceXQuantity",
-                        "wholeOrderAmount",
-                        "processResultName",
-                        "comparedWholeAmount",
-                        "defineErrorName"
-                ))
-                .inMemory(Boolean.TRUE)
-                // 合并单位格
-                .registerWriteHandler(
-                        new AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelJdCheckReportLiteVersionMergeStrategy(
-                                1,
-                                mergeColumnIndex.stream().mapToInt(Integer::valueOf).toArray(),
-                                0
-                        )
-
-                )
-                // 表头与内容样式
-                .registerWriteHandler(EasyExcelWriteHandlerCellStyleUtils.getHorizontalCellStyleStrategy())
-                // 列宽
-                .registerWriteHandler(new EasyExcelCustomCellWriteHandler())
-                .sheet("比对结果")
-                .doWrite(resultList);
-
-
-        return NotifyUtils.createSysNotify(
-                targetFileName,
-                relativePath + targetFileName,
-                SysQuartzScheduleTaskStatementOfAccountRunStateEnum.成功
-        );
-
-    }
-
-    private static List<AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRow> convertAccountingUnifiedSupplierOrderJdCheckUpReport2AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRow(
-            List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> resultList) {
-
-        if (CollUtil.isEmpty(resultList)) {
-            return null;
-        }
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRow> convertResultList = new ArrayList<>();
-
-        resultList.forEach(item -> {
-
-            AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRow tmp = AnBeanUtils.copy(item, AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelRow.class);
-
-            tmp.setFormulaOrderAmount(tmp.getOrderCostAmount()
-                    .add(tmp.getRefundOrderCostAmount())
-                    .add(tmp.getTransportMerchantAssumeAmount())
-            );
-            tmp.setFormulaGoodsAmount(tmp.getGoodsCostAmount()
-                    .add(tmp.getRefundGoodsCostAmount())
-                    .add(tmp.getTransportMerchantAssumeAmount())
-            );
-
-            tmp.setDifferOrderAmount(tmp.getJdOutStandingAmount().subtract(tmp.getFormulaOrderAmount()));
-            tmp.setDifferGoodsAmount(tmp.getJdOutStandingAmount().subtract(tmp.getFormulaGoodsAmount()));
-
-            tmp.setProcessResultStr(CommonProcessResultEnum.get(tmp.getProcessResult()).getDesc());
-
-            convertResultList.add(tmp);
-
-        });
-
-        return convertResultList;
-
-    }
-
-
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/AccountingUnifiedSupplierOrderJdCheckUpReportServiceImpl.java

@@ -1,689 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskCheckStateEnum;
-import cn.superdesk.uniorder.common.enums.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum;
-import cn.superdesk.uniorder.common.enums.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountRunStateEnum;
-import cn.superdesk.uniorder.common.json.AnJsonUtils;
-import cn.superdesk.uniorder.common.lamda.AnLamdaUtils;
-import cn.superdesk.uniorder.common.numerical.AnBeanUtils;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.rest.response.ResponseResultOuterUtils;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReport;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportExample;
-import cn.superdesk.uniorder.dao.mapper.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportMapper;
-import cn.superdesk.uniorder.dao.mapper.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportMapperEx;
-import cn.superdesk.uniorder.dto._constant.ResourceConstant;
-import cn.superdesk.uniorder.dto._variable.ThirdpartJdAccountingVariable;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.*;
-import cn.superdesk.uniorder.dto.vo.order.UnifiedOrderDebugVo;
-import cn.superdesk.uniorder.dto.vo.order.UnifiedOrderGoodsDebugVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.*;
-import cn.superdesk.uniorder.notify.NotifyUtils;
-import cn.superdesk.uniorder.service.order.base.UnifiedOrderGoodsService;
-import cn.superdesk.uniorder.service.order.base.UnifiedOrderService;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportService;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdService;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 京东对账单中的订单 算是临时 sheet eg 深圳市侨城汇网络科技有限公司-2021年8月1日集采账单.xlsx
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-14 17:04:08
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-14 17:04:08
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@RequiredArgsConstructor
-@Slf4j
-@Service
-public class AccountingUnifiedSupplierOrderJdCheckUpReportServiceImpl implements AccountingUnifiedSupplierOrderJdCheckUpReportService {
-
-    private final AccountingUnifiedSupplierOrderJdCheckUpReportMapper   accountingUnifiedSupplierOrderJdCheckUpReportMapper;
-    private final AccountingUnifiedSupplierOrderJdCheckUpReportMapperEx accountingUnifiedSupplierOrderJdCheckUpReportMapperEx;
-
-    private final AccountingUnifiedSupplierOrderJdService                    accountingUnifiedSupplierOrderJdService;
-    private final AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService;
-
-    /****************************************** 正单/退单 start ******************************************/
-
-//    private UnifiedOrderMapper                   unifiedOrderMapper;
-//    private final UnifiedOrderMapperEx                 unifiedOrderMapperEx;
-//    private UnifiedOrderMapperExSupplierDimOrder unifiedOrderMapperExSupplierDimOrder;
-//    private UnifiedOrderMapperExSupplierDimGoods unifiedOrderMapperExSupplierDimGoods;
-    private final UnifiedOrderService      unifiedOrderService;
-    private final UnifiedOrderGoodsService unifiedOrderGoodsService;
-
-    /****************************************** 正单/退单   end ******************************************/
-
-
-    /****************************************** 退单 start ******************************************/
-
-//    @Autowired
-//    private UnifiedOrderReturnMapper   unifiedOrderReturnMapper;
-//    @Autowired
-//    private UnifiedOrderReturnMapperEx unifiedOrderReturnMapperEx;
-//    @Autowired
-//    private UnifiedOrderReturnService  unifiedOrderReturnService;
-
-    /****************************************** 退单   end ******************************************/
-
-    private final ResourceConstant              resourceConstant;
-    private final ThirdpartJdAccountingVariable thirdpartJdAccountingVariable;
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    @Override
-    public int insertSelective(AccountingUnifiedSupplierOrderJdCheckUpReport entity) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportMapper.insertSelective(entity);
-    }
-
-    @Override
-    public int updateByPrimaryKeySelective(AccountingUnifiedSupplierOrderJdCheckUpReport entity) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportMapper.updateByPrimaryKeySelective(entity);
-    }
-
-    public int saveOrUpdateByPrimaryKeySelective(AccountingUnifiedSupplierOrderJdCheckUpReport entityCheckUpReport, DateTime now) {
-
-        if (ObjectUtil.isNull(entityCheckUpReport.getId())) {
-            entityCheckUpReport.setCreateTime(now);
-            return insertSelective(entityCheckUpReport);
-        } else {
-            entityCheckUpReport.setCreateTime(now);
-            return updateByPrimaryKeySelective(entityCheckUpReport);
-        }
-
-    }
-
-    @Override
-    public void deleteObj(Long id) {
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReport findById(Long id) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportMapper.selectByPrimaryKey(id);
-    }
-
-    @Override
-    public PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReport> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-        return null;
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReport> findAll(Map<String, Object> queryMap) {
-        return null;
-    }
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    @Override
-    public int addAccountingUnifiedSupplierOrderJdCheckUpReport(AccountingUnifiedSupplierOrderJdCheckUpReport entity) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportMapper.insertSelective(entity);
-    }
-
-    @Override
-    public int updateAccountingUnifiedSupplierOrderJdCheckUpReport(AccountingUnifiedSupplierOrderJdCheckUpReport entity) {
-
-        AccountingUnifiedSupplierOrderJdCheckUpReport originEntity = accountingUnifiedSupplierOrderJdCheckUpReportMapper.selectByPrimaryKey(entity.getId());
-        AnBeanUtils.copy(entity, originEntity);
-        return accountingUnifiedSupplierOrderJdCheckUpReportMapper.updateByPrimaryKeySelective(originEntity);
-    }
-
-    @Override
-    public int deleteAccountingUnifiedSupplierOrderJdCheckUpReport(Long id) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportMapper.deleteByPrimaryKey(id);
-    }
-
-    @Override
-    public int deleteByBatchId(String batchId) {
-
-        if (StrUtil.isBlank(batchId)) {
-            return 0;
-        }
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportExample          example  = new AccountingUnifiedSupplierOrderJdCheckUpReportExample();
-        AccountingUnifiedSupplierOrderJdCheckUpReportExample.Criteria criteria = example.createCriteria();
-
-        criteria
-                .andBatchIdEqualTo(batchId);
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportMapper.deleteByExample(example);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReport findAccountingUnifiedSupplierOrderJdCheckUpReportById(Long id) {
-        AccountingUnifiedSupplierOrderJdCheckUpReport entity = accountingUnifiedSupplierOrderJdCheckUpReportMapper.selectByPrimaryKey(id);
-//		AssertUtil.notNull(entity);
-        return entity;
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReport findByBatchIdAndJdOrderSn(String batchId, String jdOrderSn) {
-
-        if (StrUtil.isBlank(batchId)) {
-            return null;
-        }
-        if (StrUtil.isBlank(jdOrderSn)) {
-            return null;
-        }
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportExample          example  = new AccountingUnifiedSupplierOrderJdCheckUpReportExample();
-        AccountingUnifiedSupplierOrderJdCheckUpReportExample.Criteria criteria = example.createCriteria();
-
-        criteria
-                .andBatchIdEqualTo(batchId)
-                .andJdOrderSnEqualTo(jdOrderSn);
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReport> resultList = accountingUnifiedSupplierOrderJdCheckUpReportMapper.selectByExampleWithBLOBs(example);
-
-        if (CollUtil.isNotEmpty(resultList)) {
-            return resultList.get(0);
-        } else {
-            return null;
-        }
-
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReport findByBatchIdAndJdOrderSnAndAccountingUnifiedSupplierOrderJdId(
-            String batchId,
-            String jdOrderSn,
-            Long accountingUnifiedSupplierOrderJdId) {
-
-        if (StrUtil.isBlank(batchId)) {
-            return null;
-        }
-
-        if (StrUtil.isBlank(jdOrderSn)) {
-            return null;
-        }
-
-        if (ObjectUtil.isNull(accountingUnifiedSupplierOrderJdId)) {
-            return null;
-        }
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportExample          example  = new AccountingUnifiedSupplierOrderJdCheckUpReportExample();
-        AccountingUnifiedSupplierOrderJdCheckUpReportExample.Criteria criteria = example.createCriteria();
-
-        criteria
-                .andBatchIdEqualTo(batchId)
-                .andJdOrderSnEqualTo(jdOrderSn)
-                .andAccountingUnifiedSupplierOrderJdIdEqualTo(accountingUnifiedSupplierOrderJdId);
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReport> resultList = accountingUnifiedSupplierOrderJdCheckUpReportMapper.selectByExampleWithBLOBs(example);
-
-        if (CollUtil.isNotEmpty(resultList)) {
-            return resultList.get(0);
-        } else {
-            return null;
-        }
-    }
-
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize) {
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportExample          example  = new AccountingUnifiedSupplierOrderJdCheckUpReportExample();
-        AccountingUnifiedSupplierOrderJdCheckUpReportExample.Criteria criteria = example.createCriteria();
-
-        // TODO 喜欢用Map 还是 Bean 自己喜欢... 后期添加 转 AccountingUnifiedSupplierOrderJdCheckUpReportExample.Criteria
-        // AccountingUnifiedSupplierOrderJdCheckUpReport accountingUnifiedSupplierOrderJdCheckUpReportConditions = AnBeanUtils.mapToBean(conditions,AccountingUnifiedSupplierOrderJdCheckUpReport.class);
-
-        PageHelper.startPage(pageNun, pageSize);
-        List<AccountingUnifiedSupplierOrderJdCheckUpReport>     resultList = accountingUnifiedSupplierOrderJdCheckUpReportMapper.selectByExample(example);
-        PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReport> page       = new PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReport>(resultList);
-        PageHelper.clearPage();
-
-        return new R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>>(page.getPageNum(), page.getPageSize(), (int) page.getTotal(), resultList);
-
-    }
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo>> pageQueryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        PageHelper.startPage(queryCriteria.getPageNumber(), queryCriteria.getPageSize());
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> resultList = queryGenericParam(queryCriteria, loginSysUser);
-
-        PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> page = new PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo>(resultList);
-        PageHelper.clearPage();
-
-        return new R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo>>(page.getPageNum(), page.getPageSize(), (int) page.getTotal(), resultList);
-
-    }
-
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReportDetailStatisticsVo pageQueryHeadGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportMapperEx.pageQueryHeadGenericParam(queryCriteria);
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> queryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        if (ObjectUtil.isEmpty(queryCriteria.getBatchId())) {
-            return null;
-        }
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> resultList = accountingUnifiedSupplierOrderJdCheckUpReportMapperEx.queryGenericParam(queryCriteria);
-
-        additionalInfoQueryGenericParam(resultList);
-
-        return resultList;
-    }
-
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof>> pageQueryGenericWoof(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        PageHelper.startPage(queryCriteria.getPageNumber(), queryCriteria.getPageSize());
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof> resultList = queryGenericWoof(queryCriteria, loginSysUser);
-
-        PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof> page = new PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof>(resultList);
-        PageHelper.clearPage();
-
-        return new R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof>>(page.getPageNum(), page.getPageSize(), (int) page.getTotal(), resultList);
-
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof> queryGenericWoof(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        if (ObjectUtil.isEmpty(queryCriteria.getBatchId())) {
-            return null;
-        }
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof> resultList = accountingUnifiedSupplierOrderJdCheckUpReportMapperEx.pageQueryGenericWoof(queryCriteria);
-
-        additionalInfoQueryGenericWoof(resultList);
-
-        return resultList;
-    }
-
-    public void additionalInfoQueryGenericWoof(List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof> resultList) {
-
-        if (CollUtil.isEmpty(resultList)) {
-            return;
-        }
-
-        List<String> batchIdSelected = resultList
-                .stream()
-                .filter(AnLamdaUtils.distinctByKey(o -> o.getBatchId()))
-                .map(o -> o.getBatchId())
-                .collect(Collectors.toList());
-
-        String batchId = null;
-
-        if (CollUtil.isNotEmpty(batchIdSelected)) {
-            batchId = batchIdSelected.get(0);
-        }
-
-
-        List<Long> accountingUnifiedSupplierOrderJdIdSelected = resultList
-                .stream()
-                .filter(AnLamdaUtils.distinctByKey(o -> o.getAccountingUnifiedSupplierOrderJdId()))
-                .map(o -> o.getAccountingUnifiedSupplierOrderJdId())
-                .collect(Collectors.toList());
-
-        Map<Long, List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVoWoof>> mapCheckUpReportXGoodsWoof =
-                accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.mapQueryGenericWoof(
-                        AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria
-                                .builder()
-                                .batchId(batchId)
-                                .accountingUnifiedSupplierOrderJdIdSelected(accountingUnifiedSupplierOrderJdIdSelected)
-                                .build()
-                );
-
-
-        for (AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof vo : resultList) {
-
-            /**************************************** 补 start ****************************************/
-
-            vo.setProcessResultName(ScheduleTaskCheckStateEnum.getDesc(vo.getProcessResult()));
-            vo.setDefineErrorName(SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.getDesc(vo.getDefineError()));
-
-            if (CollUtil.isNotEmpty(mapCheckUpReportXGoodsWoof.get(vo.getAccountingUnifiedSupplierOrderJdId()))) {
-                vo.setProductWoof(mapCheckUpReportXGoodsWoof.get(vo.getAccountingUnifiedSupplierOrderJdId()));
-            }
-
-            /**************************************** 子格子 start ****************************************/
-
-        }
-    }
-
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReportUpperLevelsStatisticsVo statisticsQuantityDimOrderNormalOrException(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportMapperEx.statisticsQuantityDimOrderNormalOrException(queryCriteria);
-    }
-
-    private void additionalInfoQueryGenericParam(List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo> resultList) {
-
-        if (CollUtil.isEmpty(resultList)) {
-            return;
-        }
-
-
-        for (AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo vo : resultList) {
-
-            /**************************************** 补 start ****************************************/
-
-            vo.setProcessResultName(ScheduleTaskCheckStateEnum.getDesc(vo.getProcessResult()));
-            vo.setDefineErrorName(SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.getDesc(vo.getDefineError()));
-
-        }
-
-    }
-
-    /****************************************** 检查 start ******************************************/
-
-
-    @Override
-    public List<AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimOrder> simulateGoodsSelectedDimOrder(
-            AccountingUnifiedSupplierOrderJdCheckUpReportTaskQueryCriteria queryCriteria) {
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportMapperEx.simulateGoodsSelectedDimOrder(queryCriteria);
-
-    }
-
-
-    /**
-     * 单个检查 TODO mark by linjinyu at 2022-06-168 03:24:06 - 差锁定
-     *
-     * @param listItemVo
-     * @param itemVo
-     * @return
-     */
-    @Override
-    public R<String> opCompareOrderAndCheckUpProcessDimOrderOne(
-            SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo,
-            AccountingUnifiedSupplierOrderJdListItemVo itemVo) {
-
-        try {
-
-            AccountingUnifiedSupplierOrderJdCheckUpReportOpCompareOrderAndCheckUpProcessDimOrderOneService processDimOrderOneService =
-                    AccountingUnifiedSupplierOrderJdCheckUpReportOpCompareOrderAndCheckUpProcessDimOrderOneService
-                            .builder()
-
-                            .unifiedOrderService(unifiedOrderService)
-                            .unifiedOrderGoodsService(unifiedOrderGoodsService)
-                            .accountingUnifiedSupplierOrderJdCheckUpReportService(this)
-                            .accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService(accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService)
-
-                            .resourceConstant(resourceConstant)
-                            .thirdpartJdAccountingVariable(thirdpartJdAccountingVariable)
-
-                            .taskMainIntro(listItemVo)
-                            .taskDataIntro(itemVo)
-
-                            .build();
-
-            processDimOrderOneService
-                    .initConduct()
-                    .initIntroVar()
-                    .run()
-                    // .翻滚吧...
-                    .end();
-
-
-            /**************************************** 按v2.5的需求，此逻辑是没有被考量的   end ****************************************/
-
-
-            log.info("\ncheckUpReport {}", AnJsonUtils.toJson(itemVo));
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-
-        return ResponseResultOuterUtils.createSuccesResult();
-    }
-
-    public AccountingUnifiedSupplierOrderJdCheckUpReportSnapshotStruct readSnapshotJson(String batchId, String jdOrderSn) {
-
-        log.info("\nreadSnapshotJson start \n{}\n{}\nopCheckUpDebug   end", batchId, jdOrderSn);
-
-
-        List<UnifiedOrderDebugVo>      unifiedOrderDebugVoList      = new ArrayList<>();
-        List<UnifiedOrderGoodsDebugVo> unifiedOrderGoodsDebugVoList = new ArrayList<>();
-
-        String unifiedOrderJson      = readJson(batchId + "_debug", jdOrderSn + "_orderAssholeListFromDb");
-        String unifiedOrderGoodsJson = readJson(batchId + "_debug", jdOrderSn + "_orderGoodsAssholeListFromDB");
-
-        log.info("\nreadSnapshotJson start\n{}\n{}\nreadSnapshotJson   end", unifiedOrderJson, unifiedOrderGoodsJson);
-
-        if (StrUtil.isNotBlank(unifiedOrderJson)) {
-            unifiedOrderDebugVoList = AnJsonUtils.toList(unifiedOrderJson, UnifiedOrderDebugVo.class);
-        }
-
-        if (StrUtil.isNotBlank(unifiedOrderGoodsJson)) {
-            unifiedOrderGoodsDebugVoList = AnJsonUtils.toList(unifiedOrderGoodsJson, UnifiedOrderGoodsDebugVo.class);
-        }
-
-        return AccountingUnifiedSupplierOrderJdCheckUpReportSnapshotStruct
-                .builder()
-
-                .unifiedOrderDebugVoList(unifiedOrderDebugVoList)
-                .unifiedOrderGoodsDebugVoList(unifiedOrderGoodsDebugVoList)
-
-                .build();
-    }
-
-    public String readJson(String batchId,
-                           String jdOrderSn) {
-
-        String excelExportPathRoot             = resourceConstant.getPathRoot();
-        String excelExportRelativePathTemplate = resourceConstant.getPathTemplate();
-        String excelExportRelativePathStorage  = resourceConstant.getPathStorage();
-
-        String relativePath = File.separator + "thirdpart" +
-                File.separator + "jd" +
-                File.separator + "opCompareOrderAndCheckUpProcessDimOrderOne" +
-                File.separator + batchId +
-                File.separator;
-
-        String targetFullPath = excelExportPathRoot + excelExportRelativePathStorage;
-
-        // 请求记录
-        String targetResponseFileName          = StrUtil.format("{}.json", jdOrderSn);
-        String targetResponseWriteFileFullPath = targetFullPath + relativePath + targetResponseFileName;
-
-        log.info("readJson: {}", targetResponseWriteFileFullPath);
-
-        try {
-
-            if (FileUtil.isFile(targetResponseWriteFileFullPath)) {
-                return FileUtil.readUtf8String(targetResponseWriteFileFullPath);
-            } else {
-                return null;
-            }
-
-        } catch (IORuntimeException iore) {
-            iore.printStackTrace();
-            // 文件不存在
-            return null;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-
-    }
-
-//    final ExecutorService executor = ExecutorBuilder
-//            .create()
-////            .setCorePoolSize(thirdpartJdAccountingVariable.getCorePoolSize())
-////            .setMaxPoolSize(thirdpartJdAccountingVariable.getMaxPoolSize())
-//
-//            .setCorePoolSize(5)
-//            .setMaxPoolSize(10)
-//            .useSynchronousQueue()
-//            .build();
-
-    /**
-     * 慢摇版本 // CompletableFuture.runAsync(() -> { });
-     *
-     * @param listItemVo
-     * @param resultList
-     */
-    private void opCompareOrderAndCheckUpProcess(
-            SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo,
-            List<AccountingUnifiedSupplierOrderJdListItemVo> resultList
-    ) {
-
-        if (CollUtil.isEmpty(resultList)) {
-            return;
-        }
-
-//        ExecutorService executor = null;
-
-//        if (thirdpartJdAccountingVariable.getIsOpenThreadPool()) {
-
-//        }
-
-        // 分组统计
-        Map<String, Long> groupingAndStatistics = resultList
-                .stream()
-                .collect(Collectors.groupingBy(AccountingUnifiedSupplierOrderJdListItemVo::getJdOrderSn, Collectors.counting()));
-
-        resultList.forEach(itemVo -> {
-            try {
-
-                if (thirdpartJdAccountingVariable.getIsOpenThreadPool()
-                        && groupingAndStatistics.get(itemVo.getJdOrderSn()).compareTo(1L) <= 0) {
-                    // pool
-//                    executor.execute(() -> opCompareOrderAndCheckUpProcessDimOrderOne(listItemVo, itemVo));
-                    opCompareOrderAndCheckUpProcessDimOrderOne(listItemVo, itemVo);
-                } else {
-                    opCompareOrderAndCheckUpProcessDimOrderOne(listItemVo, itemVo);
-                }
-
-
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        });
-    }
-
-    /**
-     * 步骤3:通过京东的订单数据-比对结算中心数据-生成报告
-     *
-     * @param form
-     * @param listItemVo
-     * @param loginSysUser
-     * @return
-     */
-    @Override
-    public SysNotify opCompareOrderAndCheckUp(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo,
-            LoginSysUser loginSysUser) {
-
-        log.info("opCheckUp params {}", AnJsonUtils.toJson(form));
-
-
-        List<AccountingUnifiedSupplierOrderJdListItemVo> resultList = accountingUnifiedSupplierOrderJdService.queryGenericParam(
-                AccountingUnifiedSupplierOrderJdQueryCriteria
-                        .builder()
-
-                        .batchId(form.getBatchId())
-
-                        .build(),
-                loginSysUser
-        );
-
-        log.info("\n################ opCheckUp todo list size {} start ################################", resultList.size());
-
-        opCompareOrderAndCheckUpProcess(listItemVo, resultList);
-
-        log.info("\n################ opCheckUp todo list size {}   end ################################", resultList.size());
-
-        return NotifyUtils.createSysNotify(
-                "京东对账-对账任务-对账完成",
-                StrUtil.format("#对账单号 {}#", form.getBatchId()),
-                SysQuartzScheduleTaskStatementOfAccountRunStateEnum.成功
-        );
-    }
-
-    /**
-     * 步骤3:通过报告的异常数据-重新比对结算中心数据-生成报告
-     *
-     * @param form
-     * @param listItemVo
-     * @param loginSysUser
-     * @return
-     */
-    @Override
-    public SysNotify opCompareOrderAndCheckUpOnlyException(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo,
-            LoginSysUser loginSysUser) {
-
-        log.info("opCheckUp params {}", AnJsonUtils.toJson(form));
-
-        List<AccountingUnifiedSupplierOrderJdListItemVo> resultList = accountingUnifiedSupplierOrderJdService.queryGenericParam(
-                AccountingUnifiedSupplierOrderJdQueryCriteria
-                        .builder()
-
-                        .batchId(form.getBatchId())
-                        .onlyCheckUpException(1)
-
-                        .build(),
-                loginSysUser
-        );
-
-        log.info("\n################ opCheckUp todo list size {} start ################################", resultList.size());
-
-        opCompareOrderAndCheckUpProcess(listItemVo, resultList);
-
-        log.info("\n################ opCheckUp todo list size {}   end ################################", resultList.size());
-
-        return NotifyUtils.createSysNotify(
-                "京东对账-对账任务-对账完成",
-                StrUtil.format("#对账单号 {}#", form.getBatchId()),
-                SysQuartzScheduleTaskStatementOfAccountRunStateEnum.成功
-        );
-
-    }
-
-    /**************************************** 检查任务   end ****************************************/
-
-    /****************************************** 检查   end ******************************************/
-
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsServiceImpl.java

@@ -1,647 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.superdesk.uniorder.common.enums.accounting.AccountingOrderDimCreateByEnum;
-import cn.superdesk.uniorder.common.enums.common.CommonAccountingStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskCheckStateEnum;
-import cn.superdesk.uniorder.common.lamda.AnLamdaUtils;
-import cn.superdesk.uniorder.common.numerical.AnBeanUtils;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.base.UnifiedOrder;
-import cn.superdesk.uniorder.dao.entity.base.UnifiedOrderGoods;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoods;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsExample;
-import cn.superdesk.uniorder.dao.mapper.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapper;
-import cn.superdesk.uniorder.dao.mapper.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapperEx;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimGoods;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsHeadVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVoWoof;
-import cn.superdesk.uniorder.service.order.base.UnifiedOrderGoodsService;
-import cn.superdesk.uniorder.service.order.base.UnifiedOrderService;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Description:
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2022-06-22 16:27:47
- * @UpdateUser: linjinyu
- * @UpdateDate: 2022-06-22 16:27:47
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Service
-public class AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsServiceImpl implements AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService {
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapper   accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapper;
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapperEx accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapperEx;
-
-    @Autowired
-    private UnifiedOrderService      unifiedOrderService;
-    @Autowired
-    private UnifiedOrderGoodsService unifiedOrderGoodsService;
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    @Override
-    public int insertSelective(AccountingUnifiedSupplierOrderJdCheckUpReportXGoods entity) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapper.insertSelective(entity);
-    }
-
-    @Override
-    public int insertBatch(List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> processList) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapperEx.insertBatch(processList);
-    }
-
-    @Override
-    public int updateByPrimaryKeySelective(AccountingUnifiedSupplierOrderJdCheckUpReportXGoods entity) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapper.updateByPrimaryKeySelective(entity);
-    }
-
-    @Override
-    public void deleteObj(Long id) {
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReportXGoods findById(Long id) {
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapper.selectByPrimaryKey(id);
-    }
-
-    @Override
-    public PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-        return null;
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> findAll(Map<String, Object> queryMap) {
-        return null;
-    }
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    @Override
-    public int addAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam param, LoginSysUser loginSysUser) {
-
-        DateTime now = DateUtil.date();
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportXGoods forInsertEntity = new AccountingUnifiedSupplierOrderJdCheckUpReportXGoods();
-        AnBeanUtils.copy(param, forInsertEntity);
-
-        forInsertEntity.setCreateTime(now);
-        forInsertEntity.setCreateUserId(loginSysUser.getSysUserId());
-
-//        forInsertEntity.setUpdateTime(now);
-//        forInsertEntity.setUpdateUserId(loginSysUser.getSysUserId());
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapper.insertSelective(forInsertEntity);
-    }
-
-    @Override
-    public int updateAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam param, LoginSysUser loginSysUser) {
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportXGoods originEntity = accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapper.selectByPrimaryKey(param.getId());
-        // AssertUtil.notNull(originEntity);
-        if (ObjectUtil.isNull(originEntity)) {
-            return 0;
-        }
-
-        DateTime now = DateUtil.date();
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportXGoods forUpdateEntity = new AccountingUnifiedSupplierOrderJdCheckUpReportXGoods();
-        AnBeanUtils.copy(param, forUpdateEntity);
-
-        forUpdateEntity.setId(originEntity.getId());
-//        forUpdateEntity.setUpdateTime(now);
-//        forUpdateEntity.setUpdateUserId(loginSysUser.getSysUserId());
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapper.updateByPrimaryKeySelective(forUpdateEntity);
-    }
-
-    @Override
-    public int deleteAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(Long id, LoginSysUser loginSysUser) {
-        DateTime now = DateUtil.date();
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapper.deleteByPrimaryKey(id);
-    }
-
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo findListItemVoById(Long id, LoginSysUser loginSysUser) {
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo> resultList = queryGenericParam(
-                AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria
-                        .builder()
-                        .accountingUnifiedSupplierOrderJdCheckUpReportXGoodsId(id)
-                        .build(),
-                loginSysUser);
-
-        if (CollUtil.isNotEmpty(resultList)) {
-            return resultList.get(0);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize) {
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsExample          example  = new AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsExample();
-        AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsExample.Criteria criteria = example.createCriteria();
-
-        // TODO 喜欢用Map 还是 Bean 自己喜欢... 后期添加 转 AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsExample.Criteria
-        // AccountingUnifiedSupplierOrderJdCheckUpReportXGoods accountingUnifiedSupplierOrderJdCheckUpReportXGoodsConditions = BeanUtils.mapToBean(conditions,AccountingUnifiedSupplierOrderJdCheckUpReportXGoods.class);
-
-        PageHelper.startPage(pageNun, pageSize);
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods>     resultList = accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapper.selectByExample(example);
-        PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> page       = new PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods>(resultList);
-        PageHelper.clearPage();
-
-        return new R<List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods>>(page.getPageNum(), page.getPageSize(), (int) page.getTotal(), resultList);
-
-    }
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo>> pageQueryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsExample          example  = new AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsExample();
-        AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsExample.Criteria criteria = example.createCriteria();
-
-        // TODO 添加条件... 后期添加 queryCriteria 转 AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsExample.Criteria
-
-        PageHelper.startPage(queryCriteria.getPageNumber(), queryCriteria.getPageSize());
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo>     resultList = queryGenericParam(queryCriteria, loginSysUser);
-        PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo> page       = new PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo>(resultList);
-        PageHelper.clearPage();
-
-        return new R<List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo>>(page.getPageNum(), page.getPageSize(), (int) page.getTotal(), resultList);
-
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsHeadVo queryHeadGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapperEx.queryHeadGenericParam(queryCriteria);
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo> queryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo> resultList = accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapperEx.queryGenericParam(queryCriteria);
-
-        additionalInfoQueryGenericParam(resultList);
-
-        return resultList;
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVoWoof> queryGenericWoof(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria) {
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVoWoof> resultList =
-                accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapperEx.pageQueryGenericWoof(queryCriteria);
-
-        additionalInfoQueryGenericWoof(resultList);
-
-        return resultList;
-    }
-
-    private Long fetchGroupKeyByAccountingUnifiedSupplierOrderJdId(AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVoWoof voWoof) {
-        return voWoof.getAccountingUnifiedSupplierOrderJdId();
-    }
-
-    public Map<Long, List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVoWoof>> mapQueryGenericWoof(
-            AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria) {
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVoWoof> resultList = queryGenericWoof(queryCriteria);
-
-        Map<Long, List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVoWoof>> transferMapGroupByAccountingUnifiedSupplierOrderJdId = new HashMap<>();
-
-        if (CollUtil.isNotEmpty(resultList)) {
-            transferMapGroupByAccountingUnifiedSupplierOrderJdId = resultList
-                    .parallelStream()
-                    .collect(Collectors.groupingBy(e -> fetchGroupKeyByAccountingUnifiedSupplierOrderJdId(e), Collectors.toList()));
-
-        }
-
-        return transferMapGroupByAccountingUnifiedSupplierOrderJdId;
-
-
-    }
-
-    private void additionalInfoQueryGenericParam(List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo> resultList) {
-
-        if (CollUtil.isEmpty(resultList)) {
-            return;
-        }
-
-        /**************************************** 操作人 start ****************************************/
-
-//		List<Long> sysUserIds = new ArrayList<>();
-//
-//		List<Long> createUserIds = resultList.stream().filter(o -> o.getCreateUserId() != null).filter(AnLamdaUtils.distinctByKey(o -> o.getCreateUserId())).map(o -> o.getCreateUserId()).collect(Collectors.toList());
-//		List<Long> updateUserIds = resultList.stream().filter(o -> o.getUpdateUserId() != null).filter(AnLamdaUtils.distinctByKey(o -> o.getUpdateUserId())).map(o -> o.getUpdateUserId()).collect(Collectors.toList());
-//
-//		sysUserIds.addAll(createUserIds);
-//		sysUserIds.addAll(updateUserIds);
-//		sysUserIds = sysUserIds
-//				.stream()
-//				.distinct()
-//				.collect(Collectors.toList());
-//
-//		log.info("\n{}", JSONUtil.toJsonStr(sysUserIds));
-//		Map<Long, SysUser> sysUserMap = sysUserService.convertSysUserIds2MapSysUserId2Entity(sysUserIds);
-
-        /**************************************** 供应商 start ****************************************/
-
-//		List<Long> outSaleIds = new ArrayList<>();
-//
-//		List<Long> outMerchantIds = resultList.stream().filter(o -> o.getOutMerchantId() != null).filter(AnLamdaUtils.distinctByKey(o -> o.getOutMerchantId())).map(o -> o.getOutMerchantId()).collect(Collectors.toList());
-//
-//		outSaleIds.addAll(outMerchantIds);
-//		outSaleIds = outSaleIds
-//				.stream()
-//				.distinct()
-//				.collect(Collectors.toList());
-//
-//		Map<Long, UnifiedSupplier> sysSupplierMap = sysSupplierService.convertOutSaleIds2MapOutSaleId2Entity(outSaleIds);
-
-        for (AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo vo : resultList) {
-
-
-            /**************************************** 补-时间 start ****************************************/
-
-//            CHINESE_DATE_PATTERN = "yyyy年MM月dd日";
-//            CHINESE_DATE_TIME_PATTERN = "yyyy年MM月dd日HH时mm分ss秒";
-//            NORM_DATE_PATTERN = "yyyy-MM-dd";
-//            NORM_DATETIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
-
-//			if (ObjectUtil.isNotNull(vo.getCreateTime())) {
-//				vo.setCreateTimeFormat(DateUtil.date(vo.getCreateTime()).toString(DatePattern.NORM_DATETIME_PATTERN));
-//			}
-//			if (ObjectUtil.isNotNull(vo.getUpdateTime())) {
-//				vo.setUpdateTimeFormat(DateUtil.date(vo.getUpdateTime()).toString(DatePattern.NORM_DATETIME_PATTERN));
-//			}
-
-            /**************************************** 补-来源 start ****************************************/
-
-//			if (ObjectUtil.isNotNull(vo.getServiceNo())) {
-//				vo.setServiceNoName(CommonServiceNoEnum.getByServiceNo(vo.getServiceNo()).getServiceName());
-//			} else {
-//				vo.setServiceNoName(CommonServiceNoEnum.UNKNOW.getServiceName());
-//			}
-//			if (ObjectUtil.isNotNull(vo.getSourceFrom())) {
-//				vo.setSourceFromName(CommonSourceFromEnum.getBySourceFromCode(vo.getSourceFrom()).getSourceFromName());
-//			} else {
-//				vo.setSourceFromName(CommonSourceFromEnum.UNKNOW.getSourceFromName());
-//			}
-
-            /**************************************** 补-操作人 start ****************************************/
-
-//			if (ObjectUtil.isNotNull(sysUserMap.get(vo.getCreateUserId()))) {
-//				vo.setCreateUserName(sysUserMap.get(vo.getCreateUserId()).getFullname());
-//			}
-//			if (ObjectUtil.isNotNull(sysUserMap.get(vo.getUpdateUserId()))) {
-//				vo.setUpdateUserName(sysUserMap.get(vo.getUpdateUserId()).getFullname());
-//			}
-
-        }
-
-    }
-
-    private void additionalInfoQueryGenericWoof(List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVoWoof> resultList) {
-
-        if (CollUtil.isEmpty(resultList)) {
-            return;
-        }
-    }
-
-
-    public List<AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimGoods> simulateGoodsSelected(String batchId, Integer processResult) {
-
-//        .processResult = ScheduleTaskCheckStateEnum.正常 = 1
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapperEx.simulateGoodsSelectedDimGoods(
-                AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria
-                        .builder()
-
-                        .batchId(batchId)
-                        .processResult(processResult)
-
-                        .build()
-        );
-    }
-
-    @Override
-    public int insertXBySingleOrder(
-            String batchId,
-            Long accountingUnifiedSupplierOrderJdId,
-            /* 必定为正单 */ UnifiedOrder orderFromDB,
-            List<UnifiedOrder> orderAsWholeListFromDB,
-            List<UnifiedOrder> predicatesUnifiedOrderByFieldCompletStateEq1Filter,
-            List<UnifiedOrderGoods> predicatesUnifiedOrderGoodsByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter,
-            AccountingOrderDimCreateByEnum dimCreateByEnum,
-            ScheduleTaskCheckStateEnum checkStateEnum,
-            DateTime now) {
-
-        if (StrUtil.isBlank(batchId)) {
-            return 0;
-        }
-        if (ObjectUtil.isNull(accountingUnifiedSupplierOrderJdId)) {
-            return 0;
-        }
-        if (ObjectUtil.isNull(orderFromDB)) {
-            return 0;
-        }
-        if (CollUtil.isEmpty(orderAsWholeListFromDB)) {
-            return 0;
-        }
-        if (CollUtil.isEmpty(predicatesUnifiedOrderByFieldCompletStateEq1Filter)) {
-            return 0;
-        }
-        if (CollUtil.isEmpty(predicatesUnifiedOrderGoodsByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter)) {
-            return 0;
-        }
-
-        Map<String, UnifiedOrder> orderAsWholeListFromDBMap = orderAsWholeListFromDB
-                .stream()
-                .collect(Collectors.toMap(UnifiedOrder::getOrderSn, v -> v, (k, v) -> v));
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> processList = new ArrayList<>();
-
-        predicatesUnifiedOrderGoodsByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter.forEach(item -> {
-
-            processList.add(AccountingUnifiedSupplierOrderJdCheckUpReportXGoods
-                    .builder()
-
-                    // .id()
-                    .dimCreateBy(dimCreateByEnum.getKey())
-
-                    .batchId(batchId)
-                    .accountingUnifiedSupplierOrderJdId(accountingUnifiedSupplierOrderJdId)
-
-                    .accountingOrderId(0L)
-                    .accountingOrderSn("")
-
-                    /**************************************** 牵引的订单 start ****************************************/
-
-                    .doggodOrderSnAsWhole(orderFromDB.getOrderSn())
-                    .processResult(checkStateEnum.getKey())
-
-                    /**************************************** 牵引的订单   end ****************************************/
-
-                    /**************************************** 具体的订单 start ****************************************/
-
-                    .doggodOrderAccountingStateSupplier(orderAsWholeListFromDBMap.get(item.getOrderSn()).getAccountingStateSupplier())
-                    .unifiedOrderId(orderAsWholeListFromDBMap.get(item.getOrderSn()).getId())
-                    .orderSn(item.getOrderSn())
-
-                    /**************************************** 具体的订单   end ****************************************/
-
-
-                    /**************************************** 具体的订单商品 start ****************************************/
-
-                    .doggodGoodsAccountingStateSupplier(item.getAccountingStateSupplier())
-                    .unifiedOrderGoodsId(item.getId())
-                    .goodsId(item.getGoodsId())
-                    .goodsCostPrice(item.getCostPrice())
-                    .goodsQuantity(item.getQuantity())
-                    .goodsCostAmount(item.getCostPrice().multiply(new BigDecimal(item.getQuantity())))
-                    .outSnapshotOrderGoodsId(item.getOutSnapshotOrderGoodsId())
-
-                    /**************************************** 具体的订单商品   end ****************************************/
-
-                    .unifiedOrderCreditId(0L)
-
-                    .createTime(now)
-                    .createUserId(996L)
-
-                    .build()
-            );
-        });
-
-        int ret = insertBatch(processList);
-
-        return ret;
-    }
-
-    /**
-     * 目前此方法为两个阶段数据补刀产物，不清楚就不要用
-     *
-     * @param batchId
-     * @param orderFromDB
-     * @return
-     */
-//    @Deprecated
-//    @Override
-//    public int nullOrInsertXBySingleOrder(String batchId,
-//                                          UnifiedOrder orderFromDB) {
-//
-//        DateTime now = DateUtil.date();
-//
-//        /* 正单 ---- 从京东单作为引子 这里必定是正单 */
-//        // UnifiedOrder orderFromDB =
-//        /* 退单 ---- 三种情况 0 1 N */
-//        List<UnifiedOrder> refundOrderListFromDB  = new ArrayList<>();
-//        /* 整单 ---- */
-//        List<UnifiedOrder> orderAsWholeListFromDB = new ArrayList<>();
-//
-//        // TODO mark by linjinyu at 2022-06-22 20:45:24 - 此处要 拉成 正负单下的所有商品
-//        List<UnifiedOrderGoods> orderGoodsListFromDB = unifiedOrderGoodsService.findByOrderSn(orderFromDB.getOrderSn());
-//
-//        /**************************************** 对账的 - 排除单向结算(只留下供应商结算的) start ****************************************/
-//
-//        List<Predicate<UnifiedOrderGoods>> predicatesByFieldAccountingStateSupplierNotEqMinus1 = new ArrayList<>();
-//        predicatesByFieldAccountingStateSupplierNotEqMinus1.add(r -> r.getAccountingStateSupplier() != null && r.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.不对账.getKey()) != 0);
-//        List<UnifiedOrderGoods> predicatesByAccountingStateSupplierNotEqMinus1Filter = AnLamdaUtils.filters(orderGoodsListFromDB, predicatesByFieldAccountingStateSupplierNotEqMinus1);
-//
-//        /**************************************** 不对账 start ****************************************/
-//
-//        List<Predicate<UnifiedOrderGoods>> predicatesByFieldAccountingStateSupplierEqMinus1 = new ArrayList<>();
-//        predicatesByFieldAccountingStateSupplierEqMinus1.add(r -> r.getAccountingStateSupplier() != null && r.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.不对账.getKey()) == 0);
-//        List<UnifiedOrderGoods> predicatesByAccountingStateSupplierEqMinus1Filter = AnLamdaUtils.filters(orderGoodsListFromDB, predicatesByFieldAccountingStateSupplierEqMinus1);
-//
-//        // 按 供应商对账状态 分切
-//        // |---- 不对账(-1, "不对账"),
-//        // |---- 已对账(1, "已对账"), // ----
-//        // |---- 未对账(2, "未对账"), // ----
-//        // |---- 已作废(3, "已作废"), // ---- mark by linjinyu 20200713 为了作废订单
-//        // |---- 已锁定(4, "已锁定"), // ---- mark by linjinyu 20220615 为了京东对账
-//
-//
-//        /**************************************** 未对账 start ****************************************/
-//
-//        List<Predicate<UnifiedOrderGoods>> predicatesByFieldAccountingStateSupplierEq2 = new ArrayList<>();
-//        predicatesByFieldAccountingStateSupplierEq2.add(r -> r.getAccountingStateSupplier() != null && r.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.未对账.getKey()) == 0);
-//        List<UnifiedOrderGoods> predicatesByAccountingStateSupplierEq2Filter = AnLamdaUtils.filters(predicatesByAccountingStateSupplierNotEqMinus1Filter, predicatesByFieldAccountingStateSupplierEq2);
-//
-//        /**************************************** 已对账 start ****************************************/
-//
-//        List<Predicate<UnifiedOrderGoods>> predicatesByFieldAccountingStateSupplierEq1 = new ArrayList<>();
-//        predicatesByFieldAccountingStateSupplierEq1.add(r -> r.getAccountingStateSupplier() != null && r.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.已对账.getKey()) == 0);
-//        List<UnifiedOrderGoods> predicatesByAccountingStateSupplierEq1Filter = AnLamdaUtils.filters(predicatesByAccountingStateSupplierNotEqMinus1Filter, predicatesByFieldAccountingStateSupplierEq1);
-//
-//        /**************************************** 已锁定 start ****************************************/
-//
-//        List<Predicate<UnifiedOrderGoods>> predicatesByFieldAccountingStateSupplierEq4 = new ArrayList<>();
-//        predicatesByFieldAccountingStateSupplierEq4.add(r -> r.getAccountingStateSupplier() != null && r.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.已锁定.getKey()) == 0);
-//        List<UnifiedOrderGoods> predicatesByAccountingStateSupplierEq4Filter = AnLamdaUtils.filters(predicatesByAccountingStateSupplierNotEqMinus1Filter, predicatesByFieldAccountingStateSupplierEq4);
-//
-//
-//        return insertXBySingleOrder(
-//                batchId,
-//                orderFromDB, ,
-//                predicatesByAccountingStateSupplierNotEqMinus1Filter, AccountingOrderDimCreateByEnum.订单,
-//                , now);
-//    }
-    @Override
-    public int lockXBySingleOrder(String batchId,
-                                  UnifiedOrder orderFromDB,
-                                  List<UnifiedOrder> orderAsWholeListFromDB,
-                                  List<UnifiedOrder> predicatesByFieldCompletStateEq1Filter,
-                                  List<UnifiedOrderGoods> predicatesByAccountingStateSupplierEq2Filter) {
-
-        if (StrUtil.isBlank(batchId)) {
-            return 0;
-        }
-        if (ObjectUtil.isNull(orderFromDB)) {
-            return 0;
-        }
-        if (CollUtil.isEmpty(orderAsWholeListFromDB)) {
-            return 0;
-        }
-        if (CollUtil.isEmpty(predicatesByFieldCompletStateEq1Filter)) {
-            return 0;
-        }
-        if (CollUtil.isEmpty(predicatesByAccountingStateSupplierEq2Filter)) {
-            return 0;
-        }
-
-        /**************************************** 加锁 start ****************************************/
-
-//        List<String> processOrderSn = Arrays.asList(orderFromDB.getOrderSn());
-        List<String> processOrderSn = predicatesByFieldCompletStateEq1Filter
-                .stream()
-                .map(UnifiedOrder::getOrderSn)
-                .collect(Collectors.toList());
-
-        List<Long> processSysUnifiedOrderGoodsIds = predicatesByAccountingStateSupplierEq2Filter
-                .stream()
-                // 有没有这样的可能呢? 不管，为了安全 start
-                .filter(o -> null != o.getId())
-                .filter(AnLamdaUtils.distinctByKey(o -> o.getId()))
-                // 有没有这样的可能呢? 不管，为了安全   end
-                .map(UnifiedOrderGoods::getId)
-                .collect(Collectors.toList());
-
-        // 更新 订单 供应商对账状态 -> commonAccountingStateEnum(未对账|已锁定)
-        unifiedOrderService.updateAccountingStateSupplierByOrderSns(processOrderSn, CommonAccountingStateEnum.已锁定);
-
-        // 更新 商品 供应商对账状态 -> commonAccountingStateEnum(未对账|已锁定)
-        unifiedOrderGoodsService.updateAccountingStateSupplierByOrderSnAndSysUnifiedOrderGoodsIds(processOrderSn, processSysUnifiedOrderGoodsIds, CommonAccountingStateEnum.已锁定);
-
-        // 更新 流水 供应商对账状态  -> commonAccountingStateEnum((未对账|已锁定) 此处就不做多余的事了
-        // unifiedOrderCreditService.updateFieldAccountingStateSupplierByOrderSnAndOutGoodsIds(processOrderSn, processOutGoodsIds, CommonAccountingStateEnum.已锁定);
-
-        /**************************************** 加锁   end ****************************************/
-
-        return 1;
-    }
-
-
-    @Override
-    public int lockXByBatchId(/* 对账号(批次号)*/String batchId) {
-        return 0;
-    }
-
-    // /* 未对账|已锁定 */CommonAccountingStateEnum commonAccountingStateEnum
-    @Override
-    public int unLockXByBatchId(/* 对账号(批次号)*/String batchId) {
-
-        /**
-         * TODO mark by linjinyu at 2022-06-22 18:52:01 - 目前要求订单商品维度-此方案是错的
-         * {@link AccountingUnifiedSupplierOrderJdCheckUpReportServiceImpl#simulateGoodsSelectedDimOrder}
-         * 用此表记录的 -accounting_unified_supplier_order_jd_check_up_report_x_goods
-
-         // 构造
-         List<AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimOrder> simulateGoodsSelected = new ArrayList<>();
-         simulateGoodsSelected = accountingUnifiedSupplierOrderJdCheckUpReportService.simulateGoodsSelectedDimOrder(
-         AccountingUnifiedSupplierOrderJdCheckUpReportTaskQueryCriteria
-         .builder()
-         .batchId(batchId)
-         .processResult(CommonProcessResultEnum.正常.getKey()) // ---- 异常的是不会锁定 所以不用动
-         .build()
-         );
-         */
-
-        List<AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimGoods> simulateGoodsSelected = simulateGoodsSelected(batchId, null);
-
-        if (CollUtil.isEmpty(simulateGoodsSelected)) {
-            return 0;
-        }
-
-        List<Long>   processSysUnifiedOrderIds      = simulateGoodsSelected.stream().filter(o -> null != o.getUnifiedOrderId()).filter(AnLamdaUtils.distinctByKey(o -> o.getUnifiedOrderId())).map(AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimGoods::getUnifiedOrderId).collect(Collectors.toList());
-        List<Long>   processSysUnifiedOrderGoodsIds = simulateGoodsSelected.stream().filter(o -> null != o.getUnifiedOrderGoodsId()).filter(AnLamdaUtils.distinctByKey(o -> o.getUnifiedOrderGoodsId())).map(AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimGoods::getUnifiedOrderGoodsId).collect(Collectors.toList());
-        List<Long>   processOutGoodsIds             = simulateGoodsSelected.stream().filter(o -> null != o.getGoodsId()).filter(AnLamdaUtils.distinctByKey(o -> o.getGoodsId())).map(AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimGoods::getGoodsId).collect(Collectors.toList());
-        List<String> processOrderSn                 = simulateGoodsSelected.stream().filter(o -> null != o.getOrderSn()).filter(AnLamdaUtils.distinctByKey(o -> o.getOrderSn())).map(AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimGoods::getOrderSn).collect(Collectors.toList());
-
-
-        // 更新 订单 供应商对账状态 -> commonAccountingStateEnum(未对账|已锁定)
-        int ret001 = unifiedOrderService.updateAccountingStateSupplierByOrderSns(processOrderSn, CommonAccountingStateEnum.未对账);
-
-        // 更新 商品 供应商对账状态 -> commonAccountingStateEnum(未对账|已锁定)
-        int ret002 = unifiedOrderGoodsService.updateAccountingStateSupplierByOrderSnAndSysUnifiedOrderGoodsIds(
-                processOrderSn,
-                processSysUnifiedOrderGoodsIds,
-                CommonAccountingStateEnum.未对账);
-
-        // 更新 流水 供应商对账状态  -> commonAccountingStateEnum((未对账|已锁定) 此处就不做多余的事了
-//        unifiedOrderCreditService.updateFieldAccountingStateSupplierByOrderSnAndOutGoodsIds(processOrderSn, processOutGoodsIds, commonAccountingStateEnum);
-
-        return ret002;
-    }
-
-    @Override
-    public int deleeteXByBatchId(String batchId) {
-
-        if (StrUtil.isBlank(batchId)) {
-            return 0;
-        }
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsExample          example  = new AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsExample();
-        AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsExample.Criteria criteria = example.createCriteria();
-
-        criteria
-                .andBatchIdEqualTo(batchId);
-
-        return accountingUnifiedSupplierOrderJdCheckUpReportXGoodsMapper.deleteByExample(example);
-    }
-
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/AccountingUnifiedSupplierOrderJdExportExcelServiceImpl.java

@@ -1,110 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl;
-
-import cn.hutool.core.io.FileUtil;
-import cn.superdesk.uniorder.common.enums.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountRunStateEnum;
-import cn.superdesk.uniorder.common.excel.ExcelResponse;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dto._constant.ResourceConstant;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdListItemVo;
-import cn.superdesk.uniorder.notify.NotifyUtils;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdExportExcelService;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelWriter;
-import com.alibaba.excel.write.builder.ExcelWriterBuilder;
-import com.alibaba.excel.write.metadata.WriteSheet;
-import com.alibaba.excel.write.metadata.fill.FillConfig;
-import com.alibaba.excel.write.metadata.fill.FillWrapper;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.util.List;
-
-/**
- * @Description: Java类作用描述
- * @Author: linjinyu
- * @CreateDate: 2022/6/15 9:47 上午
- * @UpdateUser: linjinyu
- * @UpdateDate: 2022/6/15 9:47 上午
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Service
-public class AccountingUnifiedSupplierOrderJdExportExcelServiceImpl
-        implements AccountingUnifiedSupplierOrderJdExportExcelService {
-
-    @Autowired
-    private ResourceConstant resourceConstant;
-
-    private static final String TEMPLATE_EXCEL_EXPORT_ACCOUNTING_UNIFIED_SUPPLIER_ORDER_JD = "exportExcelJd_v20220615.xlsx";
-
-    @Override
-    public SysNotify exportExcelJdImportRecord(
-            List<AccountingUnifiedSupplierOrderJdListItemVo> resultList,
-            String batchId,
-            LoginSysUser loginSysUser) {
-
-        String excelExportPathRoot             = resourceConstant.getPathRoot();
-        String excelExportRelativePathTemplate = resourceConstant.getPathTemplate();
-        String excelExportRelativePathStorage  = resourceConstant.getPathStorage();
-
-        String relativePath = File.separator + "excel" +
-                File.separator + "accounting" +
-                File.separator + "score" +
-                File.separator + "jd" +
-                File.separator;
-
-        String templateRelativePath = excelExportPathRoot + excelExportRelativePathTemplate + relativePath;
-        String templateFullPath;
-
-        String targetFullPath = excelExportPathRoot + excelExportRelativePathStorage;
-
-        String targetFileName          = "京东对账" + "_" + "对账单号_" + batchId + ExcelResponse.addTail() + ".xlsx";
-        String targetWriteFileFullPath = targetFullPath + relativePath + targetFileName;
-
-//		if (!FileUtil.exist(targetWriteFileFullPath)) {
-//			FileUtil.mkdir(targetWriteFileFullPath);
-//		}
-        FileUtil.touch(targetWriteFileFullPath);
-
-
-        templateFullPath = templateRelativePath + TEMPLATE_EXCEL_EXPORT_ACCOUNTING_UNIFIED_SUPPLIER_ORDER_JD;
-
-
-        /**************************************** fill start ****************************************/
-
-        ExcelWriterBuilder excelWriterBuilder = EasyExcel
-                .write(targetWriteFileFullPath);
-        ExcelWriter excelWriter = null;
-
-        WriteSheet writeSheet0 = EasyExcel
-                .writerSheet(0, "列表")
-                .build();
-        FillConfig fillConfig = FillConfig
-                .builder()
-                .forceNewRow(Boolean.FALSE)
-                .build();
-        excelWriter = excelWriterBuilder
-                .withTemplate(templateFullPath)
-                .build();
-        excelWriter
-                .fill(new FillWrapper("detail", resultList), fillConfig, writeSheet0);
-        // 别忘记关闭流
-        excelWriter
-                .finish();
-
-        /**************************************** fill start ****************************************/
-
-
-
-
-        return NotifyUtils.createSysNotify(
-                targetFileName,
-                relativePath + targetFileName,
-                SysQuartzScheduleTaskStatementOfAccountRunStateEnum.成功
-        );
-    }
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/AccountingUnifiedSupplierOrderJdServiceImpl.java

@@ -1,555 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.io.file.FileReader;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.superdesk.uniorder.common.chinese.AnChineseCharacterUtils;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskProcessStateEnum;
-import cn.superdesk.uniorder.common.enums.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountRunStateEnum;
-import cn.superdesk.uniorder.common.excel.converters.szhtxx.CustomStringBigDecimalConverter;
-import cn.superdesk.uniorder.common.json.AnJsonUtils;
-import cn.superdesk.uniorder.common.numerical.AnBeanUtils;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJd;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdExample;
-import cn.superdesk.uniorder.dao.mapper.thirdpart.jd.AccountingUnifiedSupplierOrderJdMapper;
-import cn.superdesk.uniorder.dao.mapper.thirdpart.jd.AccountingUnifiedSupplierOrderJdMapperEx;
-import cn.superdesk.uniorder.dto._constant.ResourceConstant;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.*;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdDetailStatisticsVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdListItemVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdUpperLevelsStatisticsVo;
-import cn.superdesk.uniorder.notify.NotifyUtils;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdService;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelReader;
-import com.alibaba.excel.read.metadata.ReadSheet;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-/**
- * @Description: 京东对账单中的订单 算是临时 sheet eg 深圳市侨城汇网络科技有限公司-2021年8月1日集采账单.xlsx
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-12 11:29:24
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-12 11:29:24
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@RequiredArgsConstructor
-@Slf4j
-@Service
-public class AccountingUnifiedSupplierOrderJdServiceImpl implements AccountingUnifiedSupplierOrderJdService {
-
-    private final AccountingUnifiedSupplierOrderJdMapper   accountingUnifiedSupplierOrderJdMapper;
-    private final AccountingUnifiedSupplierOrderJdMapperEx accountingUnifiedSupplierOrderJdMapperEx;
-
-    @Autowired
-    private ResourceConstant resourceConstant;
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    @Override
-    public int insertSelective(AccountingUnifiedSupplierOrderJd entity) {
-        return accountingUnifiedSupplierOrderJdMapper.insertSelective(entity);
-    }
-
-    @Override
-    public int updateByPrimaryKeySelective(AccountingUnifiedSupplierOrderJd entity) {
-        return accountingUnifiedSupplierOrderJdMapper.updateByPrimaryKeySelective(entity);
-    }
-
-    @Override
-    public void deleteObj(Long id) {
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJd findById(Long id) {
-        return accountingUnifiedSupplierOrderJdMapper.selectByPrimaryKey(id);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJd findByBatchIdAndJdOrderSn(String batchId, String jdOrderSn) {
-
-        if (StrUtil.isBlank(batchId) || StrUtil.isBlank(jdOrderSn)) {
-            return null;
-        }
-
-        AccountingUnifiedSupplierOrderJdExample          example  = new AccountingUnifiedSupplierOrderJdExample();
-        AccountingUnifiedSupplierOrderJdExample.Criteria criteria = example.createCriteria();
-
-        criteria
-                .andBatchIdEqualTo(batchId)
-                .andJdOrderSnEqualTo(jdOrderSn);
-
-        List<AccountingUnifiedSupplierOrderJd> resultList = accountingUnifiedSupplierOrderJdMapper.selectByExample(example);
-
-        if (CollUtil.isNotEmpty(resultList)) {
-            return resultList.get(0);
-        } else {
-            return null;
-        }
-
-    }
-
-    @Override
-    public PageInfo<AccountingUnifiedSupplierOrderJd> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-        return null;
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJd> findAll(Map<String, Object> queryMap) {
-        return null;
-    }
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    @Override
-    public void addAccountingUnifiedSupplierOrderJd(AccountingUnifiedSupplierOrderJd entity) {
-        accountingUnifiedSupplierOrderJdMapper.insertSelective(entity);
-    }
-
-    @Override
-    public void updateAccountingUnifiedSupplierOrderJd(AccountingUnifiedSupplierOrderJd entity) {
-        AccountingUnifiedSupplierOrderJd originEntity = accountingUnifiedSupplierOrderJdMapper.selectByPrimaryKey(entity.getId());
-//		AssertUtil.notNull(originEntity);
-        AnBeanUtils.copy(entity, originEntity);
-        accountingUnifiedSupplierOrderJdMapper.updateByPrimaryKeySelective(originEntity);
-    }
-
-    @Override
-    public void updateAccountingUnifiedSupplierOrderJdByPrimaryKeySelective(AccountingUnifiedSupplierOrderJd entity) {
-
-        accountingUnifiedSupplierOrderJdMapper.updateByPrimaryKeySelective(entity);
-    }
-
-    @Override
-    public void deleteAccountingUnifiedSupplierOrderJd(Long id) {
-        accountingUnifiedSupplierOrderJdMapper.deleteByPrimaryKey(id);
-    }
-
-    @Override
-    public int deleteByBatchId(String batchId) {
-
-        if (StrUtil.isBlank(batchId)) {
-            return 0;
-        }
-
-        AccountingUnifiedSupplierOrderJdExample          example  = new AccountingUnifiedSupplierOrderJdExample();
-        AccountingUnifiedSupplierOrderJdExample.Criteria criteria = example.createCriteria();
-
-        criteria
-                .andBatchIdEqualTo(batchId);
-
-        return accountingUnifiedSupplierOrderJdMapper.deleteByExample(example);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJd findAccountingUnifiedSupplierOrderJdById(Long id) {
-        AccountingUnifiedSupplierOrderJd entity = accountingUnifiedSupplierOrderJdMapper.selectByPrimaryKey(id);
-//		AssertUtil.notNull(entity);
-        return entity;
-    }
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJd>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize) {
-
-        AccountingUnifiedSupplierOrderJdExample          example  = new AccountingUnifiedSupplierOrderJdExample();
-        AccountingUnifiedSupplierOrderJdExample.Criteria criteria = example.createCriteria();
-
-        // TODO 喜欢用Map 还是 Bean 自己喜欢... 后期添加 转 AccountingUnifiedSupplierOrderJdExample.Criteria
-        // AccountingUnifiedSupplierOrderJd accountingUnifiedSupplierOrderJdConditions = AnBeanUtils.mapToBean(conditions,AccountingUnifiedSupplierOrderJd.class);
-
-        PageHelper.startPage(pageNun, pageSize);
-        List<AccountingUnifiedSupplierOrderJd>     resultList = accountingUnifiedSupplierOrderJdMapper.selectByExample(example);
-        PageInfo<AccountingUnifiedSupplierOrderJd> page       = new PageInfo<AccountingUnifiedSupplierOrderJd>(resultList);
-        PageHelper.clearPage();
-
-        return new R<List<AccountingUnifiedSupplierOrderJd>>(page.getPageNum(), page.getPageSize(), (int) page.getTotal(), resultList);
-
-    }
-
-    @Override
-    public R<List<AccountingUnifiedSupplierOrderJdListItemVo>> pageQueryGenericParam(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        PageHelper.startPage(queryCriteria.getPageNumber(), queryCriteria.getPageSize());
-        List<AccountingUnifiedSupplierOrderJdListItemVo>     resultList = queryGenericParam(queryCriteria, loginSysUser);
-        PageInfo<AccountingUnifiedSupplierOrderJdListItemVo> page       = new PageInfo<AccountingUnifiedSupplierOrderJdListItemVo>(resultList);
-        PageHelper.clearPage();
-
-        return new R<List<AccountingUnifiedSupplierOrderJdListItemVo>>(
-                page.getPageNum(),
-                page.getPageSize(),
-                (int) page.getTotal(),
-                resultList
-        );
-
-    }
-
-    @Override
-    public List<AccountingUnifiedSupplierOrderJdListItemVo> queryGenericParam(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        log.info("{}", AnJsonUtils.toJson(queryCriteria));
-
-        List<AccountingUnifiedSupplierOrderJdListItemVo> resultList = accountingUnifiedSupplierOrderJdMapperEx.pageQueryGenericParam(queryCriteria);
-
-        additionalInfoQueryGenericParam(resultList);
-
-        return resultList;
-    }
-
-    private void additionalInfoQueryGenericParam(List<AccountingUnifiedSupplierOrderJdListItemVo> resultList) {
-
-        if (CollUtil.isEmpty(resultList)) {
-            return;
-        }
-
-        for (AccountingUnifiedSupplierOrderJdListItemVo vo : resultList) {
-
-            /**************************************** 补 start ****************************************/
-
-            vo.setProcessResultName(ScheduleTaskProcessStateEnum.getDesc(vo.getProcessResult()));
-
-        }
-
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdDetailStatisticsVo pageQueryHeadGenericParam(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        return accountingUnifiedSupplierOrderJdMapperEx.pageQueryHeadGenericParam(queryCriteria);
-    }
-
-    @Override
-    public AccountingUnifiedSupplierOrderJdUpperLevelsStatisticsVo statisticsQuantityDimOrderNormalOrException(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-        return accountingUnifiedSupplierOrderJdMapperEx.statisticsQuantityDimOrderNormalOrException(queryCriteria);
-    }
-
-
-    /****************************************** excel import start start ******************************************/
-
-    @Override
-    public SysNotify opImportExcelFullVersion(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser) {
-
-        String excelExportPathRoot             = resourceConstant.getPathRoot();
-        String excelExportRelativePathTemplate = resourceConstant.getPathTemplate();
-        String excelExportRelativePathStorage  = resourceConstant.getPathStorage();
-
-        String targetFullPath = excelExportPathRoot + form.getTargetRelativePathAndFileName();
-
-        ExcelReader excelReader = null;
-
-        FileReader fileReader = new FileReader(targetFullPath);
-
-        try {
-            excelReader = EasyExcel.read(
-                    fileReader.getInputStream(),
-                    AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow.class,
-                    new ThirdPartJdReconciliationScheduleFullVersionExcelRowImportDataListener(
-                            this,
-                            form.getBatchId(),
-                            loginSysUser
-                    ))
-                    .registerConverter(new CustomStringBigDecimalConverter())
-                    .build();
-            ReadSheet readSheet = EasyExcel
-                    .readSheet(0)
-                    .build();
-            excelReader
-                    .read(readSheet);
-
-        } finally {
-
-            if (excelReader != null) {
-                // 这里千万别忘记关闭,读的时候会创建临时文件,到时磁盘会崩的
-                excelReader.finish();
-            }
-        }
-
-        return NotifyUtils.createSysNotify(
-                "京东对账-对账任务-已执行导入程序",
-                StrUtil.format("#对账单号 {}#", form.getBatchId()),
-                SysQuartzScheduleTaskStatementOfAccountRunStateEnum.成功
-        );
-
-    }
-
-    @Override
-    public SysNotify opImportExcelLiteVersion(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser) {
-
-        String excelExportPathRoot             = resourceConstant.getPathRoot();
-        String excelExportRelativePathTemplate = resourceConstant.getPathTemplate();
-        String excelExportRelativePathStorage  = resourceConstant.getPathStorage();
-
-        String targetFullPath = excelExportPathRoot + form.getTargetRelativePathAndFileName();
-
-        ExcelReader excelReader = null;
-
-        FileReader fileReader = new FileReader(targetFullPath);
-
-        try {
-            excelReader = EasyExcel.read(
-                    fileReader.getInputStream(),
-                    AccountingUnifiedSupplierOrderJdImportLiteVersionFacadeExcelRow.class,
-                    new ThirdPartJdReconciliationScheduleLiteVersionExcelRowImportDataListener(
-                            this,
-                            form.getBatchId(),
-                            loginSysUser
-                    ))
-//                    .registerConverter(new CustomStringBigDecimalConverter())
-                    .headRowNumber(0)
-                    .build();
-            ReadSheet readSheet = EasyExcel
-                    .readSheet(0)
-                    .build();
-            excelReader
-                    .read(readSheet);
-
-        } finally {
-
-            if (excelReader != null) {
-                // 这里千万别忘记关闭,读的时候会创建临时文件,到时磁盘会崩的
-                excelReader.finish();
-            }
-        }
-
-        return NotifyUtils.createSysNotify(
-                "京东对账-对账任务-已执行导入程序",
-                StrUtil.format("#对账单号 {}#", form.getBatchId()),
-                SysQuartzScheduleTaskStatementOfAccountRunStateEnum.成功
-        );
-
-    }
-
-    @Override
-    public void saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRow(
-            AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow excelRow, LoginSysUser loginSysUser) {
-
-        if (null == excelRow) {
-            return;
-        }
-
-        AccountingUnifiedSupplierOrderJd entity = AnBeanUtils.copy(excelRow, AccountingUnifiedSupplierOrderJd.class);
-
-        log.info("saveOrUpdate4ThirdPartJdReconciliationScheduleExcelRow\n{}\n{}", AnJsonUtils.toJson(excelRow), AnJsonUtils.toJson(entity));
-
-        AccountingUnifiedSupplierOrderJd existDB = findByBatchIdAndJdOrderSn(entity.getBatchId(), entity.getJdOrderSn());
-
-        if (ObjectUtil.isNull(existDB)) {
-            insertSelective(entity);
-        } else {
-            entity.setId(existDB.getId());
-            updateByPrimaryKeySelective(entity);
-        }
-
-    }
-
-    @Override
-    public void saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRowList(
-            List<AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow> excelRowList,
-            LoginSysUser loginSysUser) {
-
-        if (CollUtil.isEmpty(excelRowList)) {
-            return;
-        }
-
-        excelRowList.forEach(excelRow -> {
-            saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRow(excelRow, loginSysUser);
-        });
-    }
-
-    @Override
-    public int insertBatch4ThirdPartJdReconciliationScheduleFullVersionExcelRowList(
-            List<AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow> excelRowList,
-            LoginSysUser loginSysUser) {
-
-        if (CollUtil.isEmpty(excelRowList)) {
-            return 0;
-        }
-
-        List<AccountingUnifiedSupplierOrderJd> processList = new ArrayList<>();
-
-        excelRowList.forEach(excelRow -> {
-
-            AccountingUnifiedSupplierOrderJd entity = AnBeanUtils.copy(excelRow, AccountingUnifiedSupplierOrderJd.class);
-            processList.add(entity);
-
-        });
-
-        return insertBatch(processList);
-    }
-
-    @Override
-    public int insertBatch(List<AccountingUnifiedSupplierOrderJd> processList) {
-
-        if (CollUtil.isEmpty(processList)) {
-            return 0;
-        }
-
-        return accountingUnifiedSupplierOrderJdMapperEx.insertBatch(processList);
-    }
-
-    @Override
-    public int replaceBatch(List<AccountingUnifiedSupplierOrderJd> processList) {
-
-        if (CollUtil.isEmpty(processList)) {
-            return 0;
-        }
-
-        return accountingUnifiedSupplierOrderJdMapperEx.replaceBatch(processList);
-    }
-
-
-    /**
-     * 货币 Validator.MONEY
-     */
-    public final static Pattern MONEY = Pattern.compile("^((?:\\-)?\\d+(?:\\.\\d+)?)$");
-
-    @Override
-    public void basisCheckUpForV2_5(AccountingUnifiedSupplierOrderJd entity) {
-
-        /**************************************** 验证 start ****************************************/
-
-        int result = 0;
-
-//        Integer processResult = ScheduleTaskProcessStateEnum.导入中.getKey();
-
-        if (StrUtil.isBlank(entity.getJdOrderAmountStr())) {
-            result++;
-            entity.setProcessReport("对账金额内容不能为空");
-        } else if (!ReUtil.isMatch(MONEY, entity.getJdOrderAmountStr())) {
-            result++;
-            entity.setProcessReport("对账金额内容,系统无法识别");
-        }
-
-//        if (entity.getJdOrderAmount().compareTo(BigDecimal.ZERO) == 0) {
-//            result++;
-//            entity.setProcessReport("对账金额内容,系统无法识别");
-//        }
-
-        if (StrUtil.isBlank(entity.getJdOrderSn())) {
-            result++;
-            entity.setProcessReport("订单编号内容不能为空");
-        } else if (AnChineseCharacterUtils.isChinese(entity.getJdOrderSn())) {
-            result++;
-            entity.setProcessReport("订单编号内容,系统无法识别");
-        }
-
-        if (result > 0) {
-            entity.setProcessResult(ScheduleTaskProcessStateEnum.导入失败.getKey());
-        } else {
-            entity.setProcessResult(ScheduleTaskProcessStateEnum.导入成功.getKey());
-        }
-
-        /**************************************** 验证   end ****************************************/
-    }
-
-    /**
-     * 精简版
-     *
-     * @param excelRow
-     * @param loginSysUser
-     */
-    @Override
-    public void saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRow(
-            AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow excelRow,
-            LoginSysUser loginSysUser) {
-
-        if (null == excelRow) {
-            return;
-        }
-
-        AccountingUnifiedSupplierOrderJd entity = AnBeanUtils.copy(excelRow, AccountingUnifiedSupplierOrderJd.class);
-
-        basisCheckUpForV2_5(entity);
-
-        log.info("saveOrUpdate4ThirdPartJdReconciliationScheduleExcelRow\n{}\n{}",
-                AnJsonUtils.toJson(excelRow),
-                AnJsonUtils.toJson(entity)
-        );
-
-        AccountingUnifiedSupplierOrderJd existDB = findByBatchIdAndJdOrderSn(entity.getBatchId(), entity.getJdOrderSn());
-
-        if (ObjectUtil.isNull(existDB)) {
-            insertSelective(entity);
-        } else {
-            entity.setId(existDB.getId());
-            updateByPrimaryKeySelective(entity);
-        }
-
-    }
-
-    /**
-     * 精简版
-     *
-     * @param excelRowList
-     * @param loginSysUser
-     */
-    @Override
-    public void saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRowList(
-            List<AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow> excelRowList,
-            LoginSysUser loginSysUser) {
-
-        if (CollUtil.isEmpty(excelRowList)) {
-            return;
-        }
-
-        excelRowList.forEach(excelRow -> {
-            saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRow(excelRow, loginSysUser);
-        });
-    }
-
-    @Override
-    public int insertBatch4ThirdPartJdReconciliationScheduleLiteVersionExcelRowList(
-            List<AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow> excelRowList,
-            LoginSysUser loginSysUser) {
-
-        if (CollUtil.isEmpty(excelRowList)) {
-            return 0;
-        }
-
-        List<AccountingUnifiedSupplierOrderJd> processList = new ArrayList<>();
-
-        excelRowList.forEach(excelRow -> {
-
-            AccountingUnifiedSupplierOrderJd entity = AnBeanUtils.copy(excelRow, AccountingUnifiedSupplierOrderJd.class);
-
-            basisCheckUpForV2_5(entity);
-
-            processList.add(entity);
-
-        });
-
-        return insertBatch(processList);
-    }
-
-    /****************************************** excel import start   end ******************************************/
-
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/SysQuartzScheduleTaskStatementOfAccountJdExOpPartServiceImpl.java

@@ -1,305 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl;
-
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import cn.superdesk.uniorder.common.enums.common.CommonSourceFromEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskAccountingStatusEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskCheckStateEnum;
-import cn.superdesk.uniorder.common.json.AnJsonUtils;
-import cn.superdesk.uniorder.common.numerical.AnBeanUtils;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.accounting.unified.supplier.AccountingUnifiedSupplier;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJd;
-import cn.superdesk.uniorder.dto.param.accounting.unified.supplier.AccountingUnifiedSupplierCreateParamDimGoodsSelected;
-import cn.superdesk.uniorder.dto.param.accounting.unified.supplier.AccountingUnifiedSupplierOpCreateParamDimGoods;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimGoods;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpCancelForm;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpConfirmForm;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpDeleteForm;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdListItemVo;
-import cn.superdesk.uniorder.service.accounting.unified.supplier.AccountingUnifiedSupplierServiceOpCreateDimGoods;
-import cn.superdesk.uniorder.service.accounting.unified.supplier.AccountingUnifiedSupplierServiceOpCreateDimOrder;
-import cn.superdesk.uniorder.service.order.base.UnifiedOrderCreditService;
-import cn.superdesk.uniorder.service.order.base.UnifiedOrderGoodsService;
-import cn.superdesk.uniorder.service.order.base.UnifiedOrderService;
-import cn.superdesk.uniorder.service.thirdpart.jd.*;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @Description: 简易状态机 星型结构
- * @Author: linjinyu
- * @CreateDate: 10/12/20 4:28 PM
- * @UpdateUser: linjinyu
- * @UpdateDate: 10/12/20 4:28 PM
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Service
-public class SysQuartzScheduleTaskStatementOfAccountJdExOpPartServiceImpl implements SysQuartzScheduleTaskStatementOfAccountJdExOpPartService {
-
-    @Autowired
-    private SysQuartzScheduleTaskStatementOfAccountJdService           sysQuartzScheduleTaskStatementOfAccountJdService;
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService;
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdService              accountingUnifiedSupplierOrderJdService;
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportService accountingUnifiedSupplierOrderJdCheckUpReportService;
-
-    @Autowired
-    private AccountingUnifiedSupplierServiceOpCreateDimOrder accountingUnifiedSupplierServiceOpCreateDimOrder;
-    @Autowired
-    private AccountingUnifiedSupplierServiceOpCreateDimGoods accountingUnifiedSupplierServiceOpCreateDimGoods;
-
-
-    @Autowired
-    private UnifiedOrderService       unifiedOrderService;
-    @Autowired
-    private UnifiedOrderGoodsService  unifiedOrderGoodsService;
-    @Autowired
-    private UnifiedOrderCreditService unifiedOrderCreditService;
-
-
-    @Override
-    public int opDelete(
-            SysQuartzScheduleTaskStatementOfAccountJdOpDeleteForm form,
-            LoginSysUser loginSysUser) {
-
-
-        StringBuffer report = new StringBuffer();
-
-        int ret = 0;
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo itemVo = sysQuartzScheduleTaskStatementOfAccountJdService
-                .getListItemVoByBatchId(
-                        form.getBatchId(),
-                        loginSysUser
-                );
-        report.append("\n******************************************************");
-        report.append(StrUtil.format("\n{}", JSONUtil.toJsonStr(itemVo)));
-
-        if (ObjectUtil.isNull(itemVo)) {
-            report.append("\n******************************************************");
-            log.info("{}", report.toString());
-            return 0;
-        }
-
-
-        // 先解锁(订单 商品 作用->供应商对账状态(@link CommonAccountingStateEnum 4-已锁定 -> 2-未对账)) // , CommonAccountingStateEnum.未对账
-        int ret000 = accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.unLockXByBatchId(form.getBatchId());
-        int ret001 = 0;
-        int ret002 = 0;
-        int ret003 = 0;
-
-//        if (ret000 > 0) {}
-        // 删除
-        ret001 = sysQuartzScheduleTaskStatementOfAccountJdService.deleteSysQuartzScheduleTaskStatementOfAccountJd(form.getSysQuartzScheduleTaskStatementOfAccountJdId(), loginSysUser);
-        ret002 = accountingUnifiedSupplierOrderJdService.deleteByBatchId(form.getBatchId());
-        ret003 = accountingUnifiedSupplierOrderJdCheckUpReportService.deleteByBatchId(form.getBatchId());
-
-
-        report.append(StrUtil.format("\n解锁-关系{}", ret000));
-        report.append(StrUtil.format("\n删除-任务{}", ret001));
-        report.append(StrUtil.format("\n删除-导入{}", ret002));
-        report.append(StrUtil.format("\n删除-报告{}", ret003));
-
-        if (ret001 > 0) {
-            ret++;
-        }
-        if (ret002 > 0) {
-            ret++;
-        }
-        if (ret003 > 0) {
-            ret++;
-        }
-
-        report.append("\n******************************************************");
-        log.info("{}", report.toString());
-
-        return ret;
-    }
-
-    @Override
-    public int opCancel(
-            SysQuartzScheduleTaskStatementOfAccountJdOpCancelForm form,
-            LoginSysUser loginSysUser) {
-
-        StringBuffer report = new StringBuffer();
-
-        int      ret = 0;
-        DateTime now = DateUtil.date();
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo itemVo = sysQuartzScheduleTaskStatementOfAccountJdService
-                .getListItemVoByBatchId(
-                        form.getBatchId(),
-                        loginSysUser
-                );
-
-        report.append("\n******************************************************");
-        report.append(StrUtil.format("\n{}", JSONUtil.toJsonStr(itemVo)));
-
-        if (ObjectUtil.isNull(itemVo)) {
-            report.append("\n******************************************************");
-            log.info("{}", report.toString());
-            return 0;
-        }
-
-        // 先解锁(订单 商品 作用->供应商对账状态(@link CommonAccountingStateEnum 4-已锁定 -> 2-未对账)) // , CommonAccountingStateEnum.未对账
-        int ret000 = accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.unLockXByBatchId(form.getBatchId());
-        int ret001 = 0;
-        int ret002 = 0;
-        int ret003 = 0;
-
-//        if (ret000 > 0) {
-//
-//        }
-
-        // mark by linjinyu at 2022-06-23 11:43:35 - 最终还是得加 对账状态 已取消
-        ret001 = sysQuartzScheduleTaskStatementOfAccountJdService.updateByPrimaryKeySelective(
-                SysQuartzScheduleTaskStatementOfAccountJd
-                        .builder()
-                        .id(form.getSysQuartzScheduleTaskStatementOfAccountJdId())
-
-                        .accountingStatus(ScheduleTaskAccountingStatusEnum.已取消.getKey())
-
-                        .updateTime(now)
-                        .updateUserId(loginSysUser.getSysUserId())
-
-                        .build()
-
-        );
-        // 删除
-        ret002 = accountingUnifiedSupplierOrderJdService.deleteByBatchId(form.getBatchId());
-        ret003 = accountingUnifiedSupplierOrderJdCheckUpReportService.deleteByBatchId(form.getBatchId());
-
-        report.append(StrUtil.format("\n解锁-关系{}", ret000));
-        report.append(StrUtil.format("\n更新-任务{}", ret001));
-        report.append(StrUtil.format("\n删除-导入{}", ret002));
-        report.append(StrUtil.format("\n删除-报告{}", ret003));
-
-
-        if (ret001 > 0) {
-            ret++;
-        }
-        if (ret002 > 0) {
-            ret++;
-        }
-        if (ret003 > 0) {
-            ret++;
-        }
-
-        report.append("\n******************************************************");
-        log.info("{}", report.toString());
-
-        return ret;
-    }
-
-    @Override
-    public int opConfirm(
-            SysQuartzScheduleTaskStatementOfAccountJdOpConfirmForm form,
-            LoginSysUser loginSysUser) {
-
-        int      ret = 0;
-        DateTime now = DateUtil.date();
-
-        log.info("{}", AnJsonUtils.toJson(form));
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo itemVo = sysQuartzScheduleTaskStatementOfAccountJdService
-                .getListItemVoByBatchId(
-                        form.getBatchId(),
-                        loginSysUser
-                );
-
-        if (ObjectUtil.isNull(itemVo)) {
-            return 0;
-        }
-
-        /****************************************** 模拟创建 供应商结算-对账单 start ******************************************/
-
-        // 模拟选商品 ******************************************
-
-        /**
-         * TODO mark by linjinyu at 2022-06-22 18:52:01 - 目前要求订单商品维度-此方案是错的
-         * 用此表记录的 -accounting_unified_supplier_order_jd_check_up_report_x_goods
-
-         List<AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimOrder> simulateGoodsSelected = new ArrayList<>();
-         simulateGoodsSelected = accountingUnifiedSupplierOrderJdCheckUpReportService.findUnifiedSupplierCreateDimGoodsParam(
-         AccountingUnifiedSupplierOrderJdCheckUpReportTaskQueryCriteria
-         .builder()
-         .batchId(form.getBatchId())
-         .processResult(CommonProcessResultEnum.正常.getKey())
-         .build()
-         );
-
-         List<AccountingUnifiedSupplierCreateParamDimGoodsSelected> simulateGoodsSelected =
-         AnBeanUtils.copy(simulateGoodsSelected, AccountingUnifiedSupplierCreateParamDimGoodsSelected.class);
-         */
-
-        List<AccountingUnifiedSupplierJdOpCreateParamDimGoodsSimulateSelectedDimGoods> simulateGoodsSelected = accountingUnifiedSupplierOrderJdCheckUpReportXGoodsService
-                .simulateGoodsSelected(
-                        form.getBatchId(),
-                        ScheduleTaskCheckStateEnum.正常.getKey()
-                );
-
-        List<AccountingUnifiedSupplierCreateParamDimGoodsSelected> simulateGoodsSelectedTransformation =
-                AnBeanUtils.copy(simulateGoodsSelected, AccountingUnifiedSupplierCreateParamDimGoodsSelected.class);
-
-        // 模拟填表单 ******************************************
-        AccountingUnifiedSupplierOpCreateParamDimGoods opCreateParamDimGoods = new AccountingUnifiedSupplierOpCreateParamDimGoods();
-        opCreateParamDimGoods.setSpecialHandle(886);// 京东的特殊处理
-        opCreateParamDimGoods.setSourceFrom(CommonSourceFromEnum.结算中心.getSourceFromCode());
-        opCreateParamDimGoods.setStartTime(DateUtil.formatDateTime(itemVo.getCycleBeginTime()));// yyyy-MM-dd HH:mm:ss
-        opCreateParamDimGoods.setEndTime(DateUtil.formatDateTime(itemVo.getCycleEndTime()));// yyyy-MM-dd HH:mm:ss
-        opCreateParamDimGoods.setGoodsSelected(simulateGoodsSelectedTransformation);
-
-        // 模拟提交 ******************************************
-        R<AccountingUnifiedSupplier> response = accountingUnifiedSupplierServiceOpCreateDimGoods
-                .opCreateAccountingDimGoodsPreProcess(opCreateParamDimGoods, loginSysUser);
-
-        /****************************************** 模拟创建 供应商结算-对账单   end ******************************************/
-
-
-        /****************************************  start ****************************************/
-
-        SysQuartzScheduleTaskStatementOfAccountJd forUpdate = new SysQuartzScheduleTaskStatementOfAccountJd();
-        forUpdate.setId(form.getSysQuartzScheduleTaskStatementOfAccountJdId());
-
-        if (ObjectUtil.isNotNull(response.getData())) {
-
-            ret = 1;
-
-            // TODO 更新状态逻辑...
-            forUpdate.setAccountingOrderSn(response.getData().getAccountingOrderSn());
-//            forUpdate.setAccountingStatus(CommonAuditStatusEnum.已确认.getKey());
-
-        }
-        // 创建对账单 异常
-        else {
-
-            forUpdate.setAccountingOrderSn(null);
-            forUpdate.setRemark("op确认账单-生成对账单异常");
-//            forUpdate.setAccountingStatus(CommonAuditStatusEnum.已取消.getKey());
-
-            // TODO mark by linjinyu at 2022-06-167 05:09:49 - 记录 异常
-        }
-
-        forUpdate.setUpdateTime(now);
-        forUpdate.setUpdateUserId(loginSysUser.getSysUserId());
-
-        sysQuartzScheduleTaskStatementOfAccountJdService.updateByPrimaryKeySelective(forUpdate);
-
-        /****************************************    end ****************************************/
-
-        return ret;
-    }
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/SysQuartzScheduleTaskStatementOfAccountJdServiceImpl.java

@@ -1,996 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import cn.superdesk.uniorder.common.enums.accounting.supplier.AccountingOrderSupplierAccountingStatusEnum;
-import cn.superdesk.uniorder.common.enums.common.CommonServiceNoEnum;
-import cn.superdesk.uniorder.common.enums.common.CommonSourceFromEnum;
-import cn.superdesk.uniorder.common.enums.invoice.supplier.InvoiceApplySupplierInvoiceProgressingStatusEnum;
-import cn.superdesk.uniorder.common.enums.invoice.supplier.InvoiceApplySupplierPayOffAccountStatusEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskAccountingStatusEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskCheckStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskProcessStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskRunStatusEnum;
-import cn.superdesk.uniorder.common.lamda.AnLamdaUtils;
-import cn.superdesk.uniorder.common.numerical.AnBeanUtils;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.organisation.UnifiedSupplier;
-import cn.superdesk.uniorder.dao.entity.sys.SysUser;
-import cn.superdesk.uniorder.dao.entity.sys.notify.SysNotify;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJd;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdExample;
-import cn.superdesk.uniorder.dao.mapper.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdMapper;
-import cn.superdesk.uniorder.dao.mapper.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdMapperEx;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.*;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.*;
-import cn.superdesk.uniorder.service.organisation.SysSupplierService;
-import cn.superdesk.uniorder.service.sys.SysUserService;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportService;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdService;
-import cn.superdesk.uniorder.service.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdService;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.StopWatch;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-/**
- * @Description: 定时任务-时刻任务-对账单
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-12 11:29:24
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-12 11:29:24
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Service
-public class SysQuartzScheduleTaskStatementOfAccountJdServiceImpl implements SysQuartzScheduleTaskStatementOfAccountJdService {
-
-    @Autowired
-    private SysQuartzScheduleTaskStatementOfAccountJdMapper   sysQuartzScheduleTaskStatementOfAccountJdMapper;
-    @Autowired
-    private SysQuartzScheduleTaskStatementOfAccountJdMapperEx sysQuartzScheduleTaskStatementOfAccountJdMapperEx;
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdService              accountingUnifiedSupplierOrderJdService;
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportService accountingUnifiedSupplierOrderJdCheckUpReportService;
-
-    @Autowired
-    private SysUserService     sysUserService;
-    @Autowired
-    private SysSupplierService sysSupplierService;
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    @Override
-    public int insertSelective(SysQuartzScheduleTaskStatementOfAccountJd entity) {
-        return sysQuartzScheduleTaskStatementOfAccountJdMapper.insertSelective(entity);
-    }
-
-    @Override
-    public int updateByPrimaryKeySelective(SysQuartzScheduleTaskStatementOfAccountJd entity) {
-        return sysQuartzScheduleTaskStatementOfAccountJdMapper.updateByPrimaryKeySelective(entity);
-    }
-
-    @Override
-    public int updateByBatchIdSelective(SysQuartzScheduleTaskStatementOfAccountJd entity) {
-
-        SysQuartzScheduleTaskStatementOfAccountJdExample          example  = new SysQuartzScheduleTaskStatementOfAccountJdExample();
-        SysQuartzScheduleTaskStatementOfAccountJdExample.Criteria criteria = example.createCriteria();
-
-        criteria
-                .andBatchIdEqualTo(entity.getBatchId());
-
-        return sysQuartzScheduleTaskStatementOfAccountJdMapper.updateByExampleSelective(entity, example);
-
-    }
-
-    @Override
-    public void deleteObj(Long id) {
-    }
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJd findById(Long id) {
-        return sysQuartzScheduleTaskStatementOfAccountJdMapper.selectByPrimaryKey(id);
-    }
-
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJd findByBatchId(String batchId) {
-
-        SysQuartzScheduleTaskStatementOfAccountJdExample          example  = new SysQuartzScheduleTaskStatementOfAccountJdExample();
-        SysQuartzScheduleTaskStatementOfAccountJdExample.Criteria criteria = example.createCriteria();
-
-        criteria.andBatchIdEqualTo(batchId);
-
-        List<SysQuartzScheduleTaskStatementOfAccountJd> resultList = sysQuartzScheduleTaskStatementOfAccountJdMapper.selectByExample(example);
-
-        if (CollUtil.isNotEmpty(resultList)) {
-            return resultList.get(0);
-        } else {
-            return null;
-        }
-
-    }
-
-    @Override
-    public PageInfo<SysQuartzScheduleTaskStatementOfAccountJd> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-        return null;
-    }
-
-    @Override
-    public List<SysQuartzScheduleTaskStatementOfAccountJd> findAll(Map<String, Object> queryMap) {
-        return null;
-    }
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    @Override
-    public int addSysQuartzScheduleTaskStatementOfAccountJd(SysQuartzScheduleTaskStatementOfAccountJdParam param, LoginSysUser loginSysUser) {
-
-        /**************************************** 初始化 start ****************************************/
-
-        DateTime now = DateUtil.date();
-
-        SysQuartzScheduleTaskStatementOfAccountJd forInsertEntity = new SysQuartzScheduleTaskStatementOfAccountJd();
-        AnBeanUtils.copy(param, forInsertEntity);
-
-        forInsertEntity.setCreateTime(now);
-        forInsertEntity.setCreateUserId(loginSysUser.getSysUserId());
-
-        forInsertEntity.setUpdateTime(now);
-        forInsertEntity.setUpdateUserId(loginSysUser.getSysUserId());
-
-        /**************************************** 初始化   end ****************************************/
-
-        /**************************************** 供应商信息 start ****************************************/
-
-        Map<Long, UnifiedSupplier> sysSupplierMap = sysSupplierService.convertOutSaleIds2MapOutSaleId2Entity(Arrays.asList(param.getOutMerchantId()));
-
-        if (sysSupplierMap.get(param.getOutMerchantId()) != null) {
-            forInsertEntity.setServiceNo(sysSupplierMap.get(param.getOutMerchantId()).getServiceNo());
-        } else {
-            forInsertEntity.setServiceNo("");
-        }
-
-        /**************************************** 供应商信息   end ****************************************/
-
-        return sysQuartzScheduleTaskStatementOfAccountJdMapper.insertSelective(forInsertEntity);
-    }
-
-    @Override
-    public int updateSysQuartzScheduleTaskStatementOfAccountJd(SysQuartzScheduleTaskStatementOfAccountJdParam param, LoginSysUser loginSysUser) {
-
-        SysQuartzScheduleTaskStatementOfAccountJd originEntity = sysQuartzScheduleTaskStatementOfAccountJdMapper.selectByPrimaryKey(param.getId());
-        // AssertUtil.notNull(originEntity);
-        if (ObjectUtil.isNull(originEntity)) {
-            return 0;
-        }
-
-        DateTime now = DateUtil.date();
-
-        SysQuartzScheduleTaskStatementOfAccountJd forUpdateEntity = new SysQuartzScheduleTaskStatementOfAccountJd();
-        AnBeanUtils.copy(param, forUpdateEntity);
-
-        forUpdateEntity.setId(originEntity.getId());
-        forUpdateEntity.setUpdateTime(now);
-        forUpdateEntity.setUpdateUserId(loginSysUser.getSysUserId());
-
-        return sysQuartzScheduleTaskStatementOfAccountJdMapper.updateByPrimaryKeySelective(forUpdateEntity);
-    }
-
-    @Override
-    public int deleteSysQuartzScheduleTaskStatementOfAccountJd(Long id, LoginSysUser loginSysUser) {
-        DateTime now = DateUtil.date();
-        return sysQuartzScheduleTaskStatementOfAccountJdMapper.deleteByPrimaryKey(id);
-    }
-
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo findListItemVoById(Long id, LoginSysUser loginSysUser) {
-
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultList = queryGenericParam(
-                SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria
-                        .builder()
-                        .sysQuartzScheduleTaskStatementOfAccountJdId(id)
-                        .build(),
-                loginSysUser);
-
-        if (CollUtil.isNotEmpty(resultList)) {
-            return resultList.get(0);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo findListItemVoByBatchId(String batchId, LoginSysUser loginSysUser) {
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultList = queryGenericParam(
-                SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria
-                        .builder()
-                        .batchId(batchId)
-                        .build(),
-                loginSysUser);
-
-        if (CollUtil.isNotEmpty(resultList)) {
-            return resultList.get(0);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public R<List<SysQuartzScheduleTaskStatementOfAccountJd>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize) {
-
-        SysQuartzScheduleTaskStatementOfAccountJdExample          example  = new SysQuartzScheduleTaskStatementOfAccountJdExample();
-        SysQuartzScheduleTaskStatementOfAccountJdExample.Criteria criteria = example.createCriteria();
-
-        // TODO 喜欢用Map 还是 Bean 自己喜欢... 后期添加 转 SysQuartzScheduleTaskStatementOfAccountJdExample.Criteria
-        // SysQuartzScheduleTaskStatementOfAccountJd sysQuartzScheduleTaskStatementOfAccountJdConditions = AnBeanUtils.mapToBean(conditions,SysQuartzScheduleTaskStatementOfAccountJd.class);
-
-        PageHelper.startPage(pageNun, pageSize);
-        List<SysQuartzScheduleTaskStatementOfAccountJd>     resultList = sysQuartzScheduleTaskStatementOfAccountJdMapper.selectByExample(example);
-        PageInfo<SysQuartzScheduleTaskStatementOfAccountJd> page       = new PageInfo<SysQuartzScheduleTaskStatementOfAccountJd>(resultList);
-        PageHelper.clearPage();
-
-        return new R<List<SysQuartzScheduleTaskStatementOfAccountJd>>(page.getPageNum(), page.getPageSize(), (int) page.getTotal(), resultList);
-
-    }
-
-    @Override
-    public R<List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo>> pageQueryGenericParam(
-            SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-
-        PageHelper.startPage(queryCriteria.getPageNumber(), queryCriteria.getPageSize());
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo>     resultList = queryGenericParam(queryCriteria, loginSysUser);
-        PageInfo<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> page       = new PageInfo<SysQuartzScheduleTaskStatementOfAccountJdListItemVo>(resultList);
-        PageHelper.clearPage();
-
-        return new R<List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo>>(page.getPageNum(), page.getPageSize(), (int) page.getTotal(), resultList);
-
-    }
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJdHeadVo queryHeadGenericParam(
-            SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        return sysQuartzScheduleTaskStatementOfAccountJdMapperEx.queryHeadGenericParam(queryCriteria);
-    }
-
-    @Override
-    public List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> queryGenericParam(
-            SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria,
-            LoginSysUser loginSysUser) {
-
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultList = sysQuartzScheduleTaskStatementOfAccountJdMapperEx.queryGenericParam(queryCriteria);
-
-        additionalInfoQueryGenericParam(resultList);
-
-        return resultList;
-    }
-
-    private void additionalInfoQueryGenericParam(List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultList) {
-
-        if (CollUtil.isEmpty(resultList)) {
-            return;
-        }
-
-        /**************************************** 操作人 start ****************************************/
-
-        List<Long> sysUserIds = new ArrayList<>();
-
-        List<Long> createUserIds = resultList.stream().filter(o -> o.getCreateUserId() != null).filter(AnLamdaUtils.distinctByKey(o -> o.getCreateUserId())).map(o -> o.getCreateUserId()).collect(Collectors.toList());
-        List<Long> updateUserIds = resultList.stream().filter(o -> o.getUpdateUserId() != null).filter(AnLamdaUtils.distinctByKey(o -> o.getUpdateUserId())).map(o -> o.getUpdateUserId()).collect(Collectors.toList());
-
-        sysUserIds.addAll(createUserIds);
-        sysUserIds.addAll(updateUserIds);
-        sysUserIds = sysUserIds
-                .stream()
-                .distinct()
-                .collect(Collectors.toList());
-
-        log.info("\n{}", JSONUtil.toJsonStr(sysUserIds));
-        Map<Long, SysUser> sysUserMap = sysUserService.convertSysUserIds2MapSysUserId2Entity(sysUserIds);
-
-        /**************************************** 操作人 start ****************************************/
-
-        List<Long> outSaleIds = new ArrayList<>();
-
-        List<Long> outMerchantIds = resultList.stream().filter(o -> o.getOutMerchantId() != null).filter(AnLamdaUtils.distinctByKey(o -> o.getOutMerchantId())).map(o -> o.getOutMerchantId()).collect(Collectors.toList());
-
-        outSaleIds.addAll(outMerchantIds);
-        outSaleIds = outSaleIds
-                .stream()
-                .distinct()
-                .collect(Collectors.toList());
-
-        Map<Long, UnifiedSupplier> sysSupplierMap = sysSupplierService.convertOutSaleIds2MapOutSaleId2Entity(outSaleIds);
-
-        for (SysQuartzScheduleTaskStatementOfAccountJdListItemVo vo : resultList) {
-
-            /**************************************** 补 start ****************************************/
-
-            vo.setProcessStateName(ScheduleTaskProcessStateEnum.getDesc(vo.getProcessState()));
-            vo.setAccountingStatusName(ScheduleTaskAccountingStatusEnum.getDesc(vo.getAccountingStatus()));
-            vo.setCheckStateName(ScheduleTaskCheckStateEnum.getDesc(vo.getCheckState()));
-
-            if (ObjectUtil.isNotNull(vo.getAusuAccountingStatus())) {
-                vo.setAusuAccountingStatusName(AccountingOrderSupplierAccountingStatusEnum.getDesc(vo.getAusuAccountingStatus()));
-            } else {
-                vo.setAusuAccountingStatus(AccountingOrderSupplierAccountingStatusEnum.未确认.getKey());
-                vo.setAusuAccountingStatusName(AccountingOrderSupplierAccountingStatusEnum.未确认.getDesc());
-            }
-            if (ObjectUtil.isNotNull(vo.getAusuInvoiceStatus())) {
-                vo.setAusuInvoiceStatusName(InvoiceApplySupplierInvoiceProgressingStatusEnum.getDesc(vo.getAusuInvoiceStatus()));
-            } else {
-                vo.setAusuInvoiceStatus(InvoiceApplySupplierInvoiceProgressingStatusEnum.未申请.getKey());
-                vo.setAusuInvoiceStatusName(InvoiceApplySupplierInvoiceProgressingStatusEnum.未申请.getDesc());
-            }
-            if (ObjectUtil.isNotNull(vo.getAusuBackAccountStatus())) {
-                vo.setAusuBackAccountStatusName(InvoiceApplySupplierPayOffAccountStatusEnum.getDesc(vo.getAusuBackAccountStatus()));
-            } else {
-
-                vo.setAusuBackAccountStatus(InvoiceApplySupplierPayOffAccountStatusEnum.待付款.getKey());
-                vo.setAusuBackAccountStatusName(InvoiceApplySupplierPayOffAccountStatusEnum.待付款.getDesc());
-//                vo.setAusuBackAccountStatusName("未付款");
-            }
-
-
-            /**************************************** 补-供应商 start ****************************************/
-
-            if (ObjectUtil.isNotNull(sysSupplierMap.get(vo.getOutMerchantId()))) {
-                vo.setSaleName(sysSupplierMap.get(vo.getOutMerchantId()).getSaleName());
-                vo.setSourceFrom(sysSupplierMap.get(vo.getOutMerchantId()).getSourceFrom());
-                vo.setSourceFromName(CommonSourceFromEnum.getBySourceFromCode(sysSupplierMap.get(vo.getOutMerchantId()).getSourceFrom()).getSourceFromName());
-            }
-
-            /**************************************** 补-时间 start ****************************************/
-
-//            CHINESE_DATE_PATTERN = "yyyy年MM月dd日";
-//            CHINESE_DATE_TIME_PATTERN = "yyyy年MM月dd日HH时mm分ss秒";
-//            NORM_DATE_PATTERN = "yyyy-MM-dd";
-//            NORM_DATETIME_PATTERN = "yyyy-MM-dd HH:mm:ss";
-
-            if (ObjectUtil.isNotNull(vo.getRunTime())) {
-                vo.setRunTimeFormat(DateUtil.date(vo.getRunTime()).toString(DatePattern.NORM_DATETIME_PATTERN));
-            }
-            if (ObjectUtil.isNotNull(vo.getProcessTime())) {
-                vo.setProcessTimeFormat(DateUtil.date(vo.getProcessTime()).toString(DatePattern.NORM_DATETIME_PATTERN));
-            }
-            if (ObjectUtil.isNotNull(vo.getAccountingTime())) {
-                vo.setAccountingTimeFormat(DateUtil.date(vo.getAccountingTime()).toString(DatePattern.NORM_DATETIME_PATTERN));
-            }
-            if (ObjectUtil.isNotNull(vo.getCheckTime())) {
-                vo.setCheckTimeFormat(DateUtil.date(vo.getCheckTime()).toString(DatePattern.NORM_DATETIME_PATTERN));
-            }
-            if (ObjectUtil.isNotNull(vo.getFinishTime())) {
-                vo.setFinishTimeFormat(DateUtil.date(vo.getFinishTime()).toString(DatePattern.NORM_DATETIME_PATTERN));
-            }
-
-            if (ObjectUtil.isNotNull(vo.getCycleBeginTime())) {
-                vo.setCycleBeginTimeFormat(DateUtil.date(vo.getCycleBeginTime()).toString(DatePattern.NORM_DATE_PATTERN));
-            }
-            if (ObjectUtil.isNotNull(vo.getCycleEndTime())) {
-                vo.setCycleEndTimeFormat(DateUtil.date(vo.getCycleEndTime()).toString(DatePattern.NORM_DATE_PATTERN));
-            }
-
-            if (ObjectUtil.isNotNull(vo.getCreateTime())) {
-                vo.setCreateTimeFormat(DateUtil.date(vo.getCreateTime()).toString(DatePattern.NORM_DATETIME_PATTERN));
-            }
-            if (ObjectUtil.isNotNull(vo.getUpdateTime())) {
-                vo.setUpdateTimeFormat(DateUtil.date(vo.getUpdateTime()).toString(DatePattern.NORM_DATETIME_PATTERN));
-            }
-
-            /**************************************** 补-来源 start ****************************************/
-
-            if (ObjectUtil.isNotNull(vo.getServiceNo())) {
-                vo.setServiceNoName(CommonServiceNoEnum.getByServiceNo(vo.getServiceNo()).getServiceName());
-            } else {
-                vo.setServiceNoName(CommonServiceNoEnum.UNKNOW.getServiceName());
-            }
-
-            if (ObjectUtil.isNotNull(vo.getSourceFrom())) {
-                vo.setSourceFromName(CommonSourceFromEnum.getBySourceFromCode(vo.getSourceFrom()).getSourceFromName());
-            } else {
-                vo.setSourceFromName(CommonSourceFromEnum.UNKNOW.getSourceFromName());
-            }
-
-            /**************************************** 补-操作人 start ****************************************/
-
-            if (ObjectUtil.isNotNull(sysUserMap.get(vo.getCreateUserId()))) {
-                vo.setCreateUserName(sysUserMap.get(vo.getCreateUserId()).getFullname());
-            }
-            if (ObjectUtil.isNotNull(sysUserMap.get(vo.getUpdateUserId()))) {
-                vo.setUpdateUserName(sysUserMap.get(vo.getUpdateUserId()).getFullname());
-            }
-
-        }
-
-    }
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo getListItemVoByBatchId(String batchId, LoginSysUser loginSysUser) {
-
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultList = queryGenericParam(
-                SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria
-                        .builder()
-                        .batchId(batchId)
-                        .build(),
-                loginSysUser
-        );
-
-        if (CollUtil.isNotEmpty(resultList)) {
-            return resultList.get(0);
-        } else {
-            return null;
-        }
-    }
-
-
-    /**************************************** 任务牵引方法 懒得做状态机 start ****************************************/
-
-    @Override
-    public int towImportExcel(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            ScheduleTaskRunStatusEnum runStatusEnum,
-            ScheduleTaskProcessStateEnum processStateEnum,
-            LoginSysUser loginSysUser) {
-
-        DateTime now = DateUtil.date();
-
-        SysQuartzScheduleTaskStatementOfAccountJd existDb = findByBatchId(form.getBatchId());
-
-        return sysQuartzScheduleTaskStatementOfAccountJdMapper.updateByPrimaryKeySelective(
-                SysQuartzScheduleTaskStatementOfAccountJd
-                        .builder()
-
-                        .id(existDb.getId())
-
-                        .runState(runStatusEnum.getKey())
-
-                        .processState(processStateEnum.getKey())
-                        .processTime(now)
-
-                        .updateTime(now)
-
-                        .build()
-        );
-
-    }
-
-    @Override
-    public int towCompareOrderAndCheckUpThenReport(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            ScheduleTaskRunStatusEnum runStatusEnum,
-            ScheduleTaskAccountingStatusEnum accountingStatusEnum,
-            LoginSysUser loginSysUser) {
-
-        DateTime now = DateUtil.date();
-
-        SysQuartzScheduleTaskStatementOfAccountJd existDb = findByBatchId(form.getBatchId());
-
-        return sysQuartzScheduleTaskStatementOfAccountJdMapper.updateByPrimaryKeySelective(
-                SysQuartzScheduleTaskStatementOfAccountJd
-                        .builder()
-
-                        .id(existDb.getId())
-
-                        .runState(runStatusEnum.getKey())
-
-                        .accountingStatus(accountingStatusEnum.getKey())
-                        .accountingTime(now)
-
-                        .updateTime(now)
-
-                        .build()
-        );
-
-    }
-
-    @Override
-    public int towCompareOrderAndCheckUpThenReportThrowException(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            ScheduleTaskRunStatusEnum runStatusEnum,
-            ScheduleTaskAccountingStatusEnum accountingStatusEnum,
-            ScheduleTaskCheckStateEnum checkStateEnum,
-            LoginSysUser loginSysUser) {
-
-        DateTime now = DateUtil.date();
-
-        SysQuartzScheduleTaskStatementOfAccountJd existDb = findByBatchId(form.getBatchId());
-
-        return sysQuartzScheduleTaskStatementOfAccountJdMapper.updateByPrimaryKeySelective(
-                SysQuartzScheduleTaskStatementOfAccountJd
-                        .builder()
-
-                        .id(existDb.getId())
-
-                        .runState(runStatusEnum.getKey())
-
-                        .accountingStatus(accountingStatusEnum.getKey())
-                        .accountingTime(now)
-
-                        .updateTime(now)
-
-                        .checkState(checkStateEnum.getKey())
-
-                        .build()
-        );
-
-    }
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo deQueueOneImportExcel(LoginSysUser loginSysUser) {
-
-        // 默认长这样
-        SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria = SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria
-                .builder()
-
-                .runState(ScheduleTaskRunStatusEnum.待导入.getKey())
-                .processState(ScheduleTaskProcessStateEnum.导入中.getKey())
-
-                .orderByClause("sqstsofaj.create_time ASC")
-
-                .build();
-
-
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultList = queryGenericParam(queryCriteria, loginSysUser);
-
-        if (CollUtil.isNotEmpty(resultList)) {
-            return resultList.get(0);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo deQueueOneCompareOrderAndCheckUpThenReport(LoginSysUser loginSysUser) {
-
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultList = queryGenericParam(
-                SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria
-                        .builder()
-
-                        .runState(ScheduleTaskRunStatusEnum.已导入.getKey())
-                        .processState(ScheduleTaskProcessStateEnum.导入成功.getKey())
-                        .accountingStatus(ScheduleTaskAccountingStatusEnum.待对账.getKey())
-
-                        .orderByClause("sqstsofaj.create_time ASC")
-
-                        .build(),
-                loginSysUser
-        );
-
-        if (CollUtil.isNotEmpty(resultList)) {
-            return resultList.get(0);
-        } else {
-            return null;
-        }
-    }
-
-    /**************************************** 任务牵引方法 懒得做状态机   end ****************************************/
-
-    /**************************************** 任务调度方法 start ****************************************/
-
-
-    @Override
-    public SysNotify dispatcherExcelImportFullVersion(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser) {
-
-        DateTime now = DateUtil.date();
-
-        StopWatch stopWatch = new StopWatch();
-        stopWatch.start(form.getBatchId());
-
-        towImportExcel(
-                form,
-                ScheduleTaskRunStatusEnum.导入中,
-                ScheduleTaskProcessStateEnum.导入中,
-                loginSysUser);
-
-        SysNotify sysNotify = accountingUnifiedSupplierOrderJdService.opImportExcelFullVersion(form, loginSysUser);
-
-        // 统计
-        AccountingUnifiedSupplierOrderJdUpperLevelsStatisticsVo detailStatisticsVo =
-                accountingUnifiedSupplierOrderJdService.statisticsQuantityDimOrderNormalOrException(
-                        AccountingUnifiedSupplierOrderJdQueryCriteria
-                                .builder()
-
-                                .batchId(form.getBatchId())
-
-                                .build(),
-                        loginSysUser
-                );
-
-        stopWatch.stop();
-        sysNotify.setTitle(StrUtil.format("{}:{}", sysNotify.getTitle(), stopWatch.getTotalTimeSeconds()));
-
-        // 统计 更新
-        updateByBatchIdSelective(
-                SysQuartzScheduleTaskStatementOfAccountJd
-                        .builder()
-
-                        .batchId(form.getBatchId())
-
-                        .statisticsAmountDimOrderOutsider(detailStatisticsVo.getStatisticsAmountDimOrderOutsider())
-
-                        .statisticsQuantityDimOrderTotal(detailStatisticsVo.getStatisticsQuantityDimOrderTotal())
-                        .statisticsQuantityDimOrderNormal(detailStatisticsVo.getStatisticsQuantityDimOrderNormal())
-                        .statisticsQuantityDimOrderException(detailStatisticsVo.getStatisticsQuantityDimOrderException())
-
-                        .timeConsumingForImport(stopWatch.getTotalTimeMillis())
-                        .updateTime(now)
-
-                        .build()
-        );
-
-        towImportExcel(
-                form,
-                ScheduleTaskRunStatusEnum.已导入,
-                ScheduleTaskProcessStateEnum.导入成功,
-                loginSysUser);
-
-        return sysNotify;
-    }
-
-    @Override
-    public SysNotify dispatcherExcelImportLiteVersion(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser) {
-
-        DateTime now = DateUtil.date();
-
-        StopWatch stopWatch = new StopWatch();
-        stopWatch.start(form.getBatchId());
-
-        /****************************************  start ****************************************/
-
-        towImportExcel(
-                form,
-                ScheduleTaskRunStatusEnum.导入中,
-                ScheduleTaskProcessStateEnum.导入中,
-                loginSysUser
-        );
-
-        SysNotify sysNotify = accountingUnifiedSupplierOrderJdService.opImportExcelLiteVersion(form, loginSysUser);
-
-
-        // 统计
-        AccountingUnifiedSupplierOrderJdUpperLevelsStatisticsVo detailStatisticsVo =
-                accountingUnifiedSupplierOrderJdService.statisticsQuantityDimOrderNormalOrException(
-                        AccountingUnifiedSupplierOrderJdQueryCriteria
-                                .builder()
-
-                                .batchId(form.getBatchId())
-
-                                .build(),
-                        loginSysUser
-                );
-
-        stopWatch.stop();
-        sysNotify.setTitle(StrUtil.format("{}:{}", sysNotify.getTitle(), stopWatch.getTotalTimeSeconds()));
-
-        /**************************************** 统计更新 start ****************************************/
-
-        updateByBatchIdSelective(
-                SysQuartzScheduleTaskStatementOfAccountJd
-                        .builder()
-
-                        .batchId(form.getBatchId())
-
-                        .statisticsAmountDimOrderOutsider(detailStatisticsVo.getStatisticsAmountDimOrderOutsider())
-
-                        .statisticsQuantityDimOrderTotal(detailStatisticsVo.getStatisticsQuantityDimOrderTotal())
-                        .statisticsQuantityDimOrderNormal(detailStatisticsVo.getStatisticsQuantityDimOrderNormal())
-                        .statisticsQuantityDimOrderException(detailStatisticsVo.getStatisticsQuantityDimOrderException())
-
-                        .timeConsumingForImport(stopWatch.getTotalTimeMillis())
-                        .updateTime(now)
-
-                        .build()
-        );
-
-        /**************************************** 统计更新   end ****************************************/
-
-        /**************************************** 流程流转 start ****************************************/
-
-
-        // 视为导入失败的两种情况 ---- 添加逻辑 ---- mark by linjinyu at 2022-06-21 16:43:16 -
-        // 1. 经统计后-对账金额为0 ---- 删除逻辑 ---- mark by linjinyu at 2022-07-01 14:50:10 -
-        // 2. 经统计后-订单数量为0
-        // 3. 经统计后-订单(异常)数量为>0 ---- 添加逻辑 - mark by linjinyu at 2022-07-01 14:50:10 -
-
-        ScheduleTaskProcessStateEnum scheduleTaskProcessStateEnum = ScheduleTaskProcessStateEnum.导入成功;
-//        BigDecimal.ZERO.compareTo(detailStatisticsVo.getStatisticsAmountDimOrderOutsider()) == 0 ||
-        if (detailStatisticsVo.getStatisticsQuantityDimOrderTotal().compareTo(0L) == 0
-                || detailStatisticsVo.getStatisticsQuantityDimOrderException().compareTo(0L) > 0) {
-            scheduleTaskProcessStateEnum = ScheduleTaskProcessStateEnum.导入失败;
-        }
-
-        towImportExcel(
-                form,
-                ScheduleTaskRunStatusEnum.已导入,
-                scheduleTaskProcessStateEnum,
-                loginSysUser);
-
-        /**************************************** 流程流转   end ****************************************/
-
-
-        return sysNotify;
-    }
-
-    @Override
-    public SysNotify dispatcherCompareOrderAndCheckUpThenReport(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser) {
-
-        DateTime now = DateUtil.date();
-
-        StopWatch stopWatch = new StopWatch();
-        stopWatch.start(form.getBatchId());
-
-
-        /**************************************** 任务状态变更 start ****************************************/
-
-        towCompareOrderAndCheckUpThenReport(
-                form,
-                ScheduleTaskRunStatusEnum.对账中,
-                ScheduleTaskAccountingStatusEnum.对账中,
-                loginSysUser
-        );
-
-        /**************************************** 任务状态变更   end ****************************************/
-
-
-        /**************************************** 检查比对 start ****************************************/
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo = findListItemVoByBatchId(
-                form.getBatchId(),
-                loginSysUser
-        );
-
-        SysNotify sysNotify = accountingUnifiedSupplierOrderJdCheckUpReportService
-                .opCompareOrderAndCheckUp(
-                        form,
-                        listItemVo,
-                        loginSysUser);
-
-        /**************************************** 检查比对   end ****************************************/
-
-
-        /**************************************** 任务相关信息 统计 更新 start ****************************************/
-
-        // 统计 供应商结算 > 京东对账 > 对账详情
-        // 第三方导入明细条数：| 1| 结算中心对账明细条数：| 0| 第三方对账金额：| ¥1196.48| 结算中心对账金额：| ¥0.00| 对账差异金额：| ¥1196.48
-        AccountingUnifiedSupplierOrderJdCheckUpReportDetailStatisticsVo detailStatisticsVo =
-                accountingUnifiedSupplierOrderJdCheckUpReportService.pageQueryHeadGenericParam(
-                        AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria
-                                .builder()
-
-                                .batchId(form.getBatchId())
-
-                                .build(),
-                        loginSysUser
-                );
-
-        log.info("统计\n{}", JSONUtil.toJsonPrettyStr(detailStatisticsVo));
-
-
-        Integer checkState = 0;
-        // Dim Order TODO mark by linjinyu at 2022-06-24 17:36:43 - 改商品维度后不能这样判定
-//        if (ObjectUtil.isNull(detailStatisticsVo.getStatisticsQuantityDimOrderOutsider())
-//                || ObjectUtil.isNull(detailStatisticsVo.getStatisticsQuantityDimOrderOwnsider())) {
-//            checkState = ScheduleTaskCheckStateEnum.异常.getKey();
-//        } else if (detailStatisticsVo.getStatisticsQuantityDimOrderOutsider()
-//                .compareTo(detailStatisticsVo.getStatisticsQuantityDimOrderOwnsider()) == 0) {
-//            checkState = ScheduleTaskCheckStateEnum.正常.getKey();
-//        } else {
-//            checkState = ScheduleTaskCheckStateEnum.异常.getKey();
-//        }
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportUpperLevelsStatisticsVo upperLevelsStatisticsVo =
-                accountingUnifiedSupplierOrderJdCheckUpReportService.statisticsQuantityDimOrderNormalOrException(
-                        AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria
-                                .builder()
-
-                                .batchId(form.getBatchId())
-
-                                .build(),
-                        loginSysUser
-                );
-
-        // Dim Goods
-        if (ObjectUtil.isNull(upperLevelsStatisticsVo.getStatisticsQuantityDimOrderNormal())
-                || ObjectUtil.isNull(upperLevelsStatisticsVo.getStatisticsQuantityDimOrderException())) {
-            checkState = ScheduleTaskCheckStateEnum.异常.getKey();
-        } else if (upperLevelsStatisticsVo.getStatisticsQuantityDimOrderException()
-                .compareTo(0L) == 0) {
-            checkState = ScheduleTaskCheckStateEnum.正常.getKey();
-        } else {
-            checkState = ScheduleTaskCheckStateEnum.异常.getKey();
-        }
-
-
-        stopWatch.stop();
-        sysNotify.setTitle(StrUtil.format("{}:{}", sysNotify.getTitle(), stopWatch.getTotalTimeSeconds()));
-
-        updateByBatchIdSelective(
-                SysQuartzScheduleTaskStatementOfAccountJd
-                        .builder()
-
-                        .batchId(form.getBatchId())
-
-                        .statisticsAmountDimOrderOutsider(detailStatisticsVo.getStatisticsAmountDimOrderOutsider())
-                        .statisticsAmountDimOrderOwnsider(detailStatisticsVo.getStatisticsAmountDimOrderOwnsider())
-
-                        // 导入时定
-                        // .statisticsQuantityDimOrderTotal(detailStatisticsVo.getStatisticsQuantityDimOrderOutsider())
-                        .statisticsQuantityDimOrderNormal(upperLevelsStatisticsVo.getStatisticsQuantityDimOrderNormal())
-                        .statisticsQuantityDimOrderException(upperLevelsStatisticsVo.getStatisticsQuantityDimOrderException())
-
-                        .checkState(checkState)
-                        .updateTime(now)
-
-                        .timeConsumingForCompare(stopWatch.getTotalTimeMillis())
-
-                        .build()
-        );
-
-        /**************************************** 任务相关信息 统计 更新   end ****************************************/
-
-
-        /**************************************** 任务状态变更 start ****************************************/
-
-        towCompareOrderAndCheckUpThenReport(
-                form,
-                ScheduleTaskRunStatusEnum.已对账,
-                ScheduleTaskAccountingStatusEnum.对账完成,
-                loginSysUser
-        );
-
-        /**************************************** 任务状态变更   end ****************************************/
-
-        return sysNotify;
-    }
-
-    @Override
-    public SysNotify dispatcherCompareOrderAndCheckUpThenReportOnlyException(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            LoginSysUser loginSysUser) {
-
-        DateTime now = DateUtil.date();
-
-        StopWatch stopWatch = new StopWatch();
-        stopWatch.start(form.getBatchId());
-
-        towCompareOrderAndCheckUpThenReport(
-                form,
-                ScheduleTaskRunStatusEnum.对账中,
-                ScheduleTaskAccountingStatusEnum.对账中,
-                loginSysUser);
-
-        /**************************************** 检查比对 start ****************************************/
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo = findListItemVoByBatchId(
-                form.getBatchId(),
-                loginSysUser
-        );
-
-        SysNotify sysNotify = accountingUnifiedSupplierOrderJdCheckUpReportService
-                .opCompareOrderAndCheckUpOnlyException(
-                        form,
-                        listItemVo,
-                        loginSysUser
-                );
-
-        /**************************************** 检查比对   end ****************************************/
-
-
-        // 统计
-        AccountingUnifiedSupplierOrderJdCheckUpReportDetailStatisticsVo detailStatisticsVo =
-                accountingUnifiedSupplierOrderJdCheckUpReportService.pageQueryHeadGenericParam(
-                        AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria
-                                .builder()
-
-                                .batchId(form.getBatchId())
-
-                                .build(),
-                        loginSysUser
-                );
-
-        /**************************************** 任务相关信息 统计 更新 start ****************************************/
-
-        Integer checkState = 0;
-
-//        if (ObjectUtil.isNull(detailStatisticsVo.getStatisticsQuantityDimOrderOutsider())
-//                || ObjectUtil.isNull(detailStatisticsVo.getStatisticsQuantityDimOrderOwnsider())) {
-//            checkState = ScheduleTaskCheckStateEnum.异常.getKey();
-//        } else if (detailStatisticsVo.getStatisticsQuantityDimOrderOutsider().compareTo(detailStatisticsVo.getStatisticsQuantityDimOrderOwnsider()) == 0) {
-//            checkState = ScheduleTaskCheckStateEnum.正常.getKey();
-//        } else {
-//            checkState = ScheduleTaskCheckStateEnum.异常.getKey();
-//        }
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportUpperLevelsStatisticsVo upperLevelsStatisticsVo =
-                accountingUnifiedSupplierOrderJdCheckUpReportService.statisticsQuantityDimOrderNormalOrException(
-                        AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria
-                                .builder()
-
-                                .batchId(form.getBatchId())
-
-                                .build(),
-                        loginSysUser
-                );
-
-        // Dim Goods
-        if (ObjectUtil.isNull(upperLevelsStatisticsVo.getStatisticsQuantityDimOrderNormal())
-                || ObjectUtil.isNull(upperLevelsStatisticsVo.getStatisticsQuantityDimOrderException())) {
-            checkState = ScheduleTaskCheckStateEnum.异常.getKey();
-        } else if (upperLevelsStatisticsVo.getStatisticsQuantityDimOrderException()
-                .compareTo(0L) == 0) {
-            checkState = ScheduleTaskCheckStateEnum.正常.getKey();
-        } else {
-            checkState = ScheduleTaskCheckStateEnum.异常.getKey();
-        }
-
-        stopWatch.stop();
-        sysNotify.setTitle(StrUtil.format("{}:{}", sysNotify.getTitle(), stopWatch.getTotalTimeSeconds()));
-
-        updateByBatchIdSelective(
-                SysQuartzScheduleTaskStatementOfAccountJd
-                        .builder()
-
-                        .batchId(form.getBatchId())
-
-                        .statisticsAmountDimOrderOutsider(detailStatisticsVo.getStatisticsAmountDimOrderOutsider())
-                        .statisticsAmountDimOrderOwnsider(detailStatisticsVo.getStatisticsAmountDimOrderOwnsider())
-
-                        // 导入时定
-                        // .statisticsQuantityDimOrderTotal(detailStatisticsVo.getStatisticsQuantityDimOrderOutsider())
-                        .statisticsQuantityDimOrderNormal(upperLevelsStatisticsVo.getStatisticsQuantityDimOrderNormal())
-                        .statisticsQuantityDimOrderException(upperLevelsStatisticsVo.getStatisticsQuantityDimOrderException())
-
-                        .checkState(checkState)
-                        .updateTime(now)
-
-                        .timeConsumingForCompare(stopWatch.getTotalTimeMillis())
-
-                        .build()
-        );
-
-        /**************************************** 任务相关信息 统计 更新   end ****************************************/
-
-
-        towCompareOrderAndCheckUpThenReport(
-                form,
-                ScheduleTaskRunStatusEnum.已对账,
-                ScheduleTaskAccountingStatusEnum.对账完成,
-                loginSysUser);
-
-        return sysNotify;
-    }
-
-    /**************************************** 任务调度方法 start ****************************************/
-
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/ThirdPartJdReconciliationScheduleFullVersionExcelRowImportDataListener.java

@@ -1,118 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl;
-
-import cn.superdesk.uniorder.common.json.AnJsonUtils;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdService;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 有个很重要的点
- * DataListener 不能被spring管理,
- * 要每次读取excel都要new,
- * 然后里面用到spring可以构造方法传进去
- * @Author: linjinyu
- * @CreateDate: 2021/3/16 下午7:06
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021/3/16 下午7:06
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-public class ThirdPartJdReconciliationScheduleFullVersionExcelRowImportDataListener
-        extends AnalysisEventListener<AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow> {
-
-    /**
-     * 每隔5条存储数据库,实际使用中可以3000条,然后清理list ,方便内存回收
-     */
-    private static final int BATCH_COUNT = 200;
-
-    private List<AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow> accountingUnifiedSupplierOrderJdExcelRows = new ArrayList<>();
-
-
-    private AccountingUnifiedSupplierOrderJdService accountingUnifiedSupplierOrderJdDubboConsumerService;
-
-    private LoginSysUser loginSysUser;
-    private String       batchId;
-
-    /**
-     * 如果使用了spring,请使用这个构造方法。每次创建Listener的时候需要把spring管理的类传进来
-     *
-     * @param accountingUnifiedSupplierOrderJdDubboConsumerService
-     * @param loginSysUser
-     */
-    public ThirdPartJdReconciliationScheduleFullVersionExcelRowImportDataListener(
-            AccountingUnifiedSupplierOrderJdService accountingUnifiedSupplierOrderJdDubboConsumerService,
-            String batchId,
-            LoginSysUser loginSysUser
-    ) {
-        this.accountingUnifiedSupplierOrderJdDubboConsumerService = accountingUnifiedSupplierOrderJdDubboConsumerService;
-
-        this.loginSysUser = loginSysUser;
-        this.batchId = batchId;
-    }
-
-    /**
-     * 这个每一条数据解析都会来调用
-     *
-     * @param excelRow one row value. Is is same as {@link AnalysisContext#readRowHolder()}
-     * @param context
-     */
-    @Override
-    public void invoke(AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow excelRow, AnalysisContext context) {
-
-        log.info("解析到一条数据: {}", AnJsonUtils.toJson(excelRow));
-
-        excelRow.setBatchId(batchId);
-        excelRow.setProcessResult(1);
-        excelRow.setProcessReport("");
-
-        accountingUnifiedSupplierOrderJdExcelRows.add(excelRow);
-
-        // 达到BATCH_COUNT了,需要去存储一次数据库,防止数据几万条数据在内存,容易OOM
-        if (accountingUnifiedSupplierOrderJdExcelRows.size() >= BATCH_COUNT) {
-
-            saveOrUpdateData();
-            // 存储完成清理 list
-            accountingUnifiedSupplierOrderJdExcelRows.clear();
-        }
-    }
-
-    /**
-     * 所有数据解析完成了 都会来调用
-     *
-     * @param context
-     */
-    @Override
-    public void doAfterAllAnalysed(AnalysisContext context) {
-
-        // 这里也要保存数据,确保最后遗留的数据也存储到数据库
-        saveOrUpdateData();
-
-        log.info("所有数据解析完成！");
-    }
-
-    /**
-     * 加上存储数据库
-     */
-    private void saveOrUpdateData() {
-
-        log.info("{} 条数据,开始存储数据库！\n{}",
-                accountingUnifiedSupplierOrderJdExcelRows.size(),
-                AnJsonUtils.toJson(accountingUnifiedSupplierOrderJdExcelRows)
-        );
-
-        accountingUnifiedSupplierOrderJdDubboConsumerService
-                .insertBatch4ThirdPartJdReconciliationScheduleFullVersionExcelRowList(
-                        accountingUnifiedSupplierOrderJdExcelRows,
-                        loginSysUser
-                );
-
-        log.info("存储数据库成功！");
-    }
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/ThirdPartJdReconciliationScheduleLiteVersionExcelRowImportDataListener.java

@@ -1,151 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl;
-
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskProcessStateEnum;
-import cn.superdesk.uniorder.common.json.AnJsonUtils;
-import cn.superdesk.uniorder.common.numerical.AnBigDecimalUtils;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdImportLiteVersionFacadeExcelRow;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdService;
-import com.alibaba.excel.context.AnalysisContext;
-import com.alibaba.excel.event.AnalysisEventListener;
-import lombok.extern.slf4j.Slf4j;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 有个很重要的点
- * DataListener 不能被spring管理,
- * 要每次读取excel都要new,
- * 然后里面用到spring可以构造方法传进去
- * @Author: linjinyu
- * @CreateDate: 2021/3/16 下午7:06
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021/3/16 下午7:06
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-public class ThirdPartJdReconciliationScheduleLiteVersionExcelRowImportDataListener
-        extends AnalysisEventListener<AccountingUnifiedSupplierOrderJdImportLiteVersionFacadeExcelRow> {
-
-    /**
-     * 每隔5条存储数据库,实际使用中可以3000条,然后清理list ,方便内存回收
-     */
-    private static final int BATCH_COUNT = 1000;
-
-    private List<AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow> accountingUnifiedSupplierOrderJdImportLiteVersionExcelRows = new ArrayList<>();
-
-    private AccountingUnifiedSupplierOrderJdService accountingUnifiedSupplierOrderJdDubboConsumerService;
-
-    private LoginSysUser loginSysUser;
-    private String       batchId;
-
-    /**
-     * 如果使用了spring,请使用这个构造方法。每次创建Listener的时候需要把spring管理的类传进来
-     *
-     * @param accountingUnifiedSupplierOrderJdDubboConsumerService
-     * @param loginSysUser
-     */
-    public ThirdPartJdReconciliationScheduleLiteVersionExcelRowImportDataListener(
-            AccountingUnifiedSupplierOrderJdService accountingUnifiedSupplierOrderJdDubboConsumerService,
-            String batchId,
-            LoginSysUser loginSysUser
-    ) {
-        this.accountingUnifiedSupplierOrderJdDubboConsumerService = accountingUnifiedSupplierOrderJdDubboConsumerService;
-
-        this.loginSysUser = loginSysUser;
-        this.batchId = batchId;
-    }
-
-
-    @Override
-    public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
-
-        log.info("解析到一条头数据:{}, currentRowHolder: {}", AnJsonUtils.toJson(headMap), context.readRowHolder().getRowIndex());
-
-        if (context.readRowHolder().getRowIndex().compareTo(0) == 0) {
-
-            log.info("[doggod] : {}", "狗头");
-        }
-
-
-//		list.add(headMap);
-    }
-
-    /**
-     * 这个每一条数据解析都会来调用
-     *
-     * @param facadeExcelRow one row value. Is is same as {@link AnalysisContext#readRowHolder()}
-     * @param context
-     */
-    @Override
-    public void invoke(AccountingUnifiedSupplierOrderJdImportLiteVersionFacadeExcelRow facadeExcelRow, AnalysisContext context) {
-
-        // 主要是这些狗没有规范，希望随心所欲，反正从第二行(rowIndex 1开始) facadeExcelRow为了限定只读第一列第二列
-        if (context.readRowHolder().getRowIndex().compareTo(0) == 0) {
-            log.info("[doggod] : {} : {}", "狗头", AnJsonUtils.toJson(facadeExcelRow));
-            return;
-        }
-
-        log.info("解析到一条数据: {}", AnJsonUtils.toJson(facadeExcelRow));
-
-
-        AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow excelRow = new AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow();
-
-        excelRow.setJdOrderAmountStr(facadeExcelRow.getJdOrderAmountStr());
-        excelRow.setJdOrderSn(facadeExcelRow.getJdOrderSn());
-
-        excelRow.setJdOrderAmount(AnBigDecimalUtils.getBigDecimal(excelRow.getJdOrderAmountStr(), BigDecimal.ZERO));
-
-        excelRow.setBatchId(batchId);
-        excelRow.setProcessResult(ScheduleTaskProcessStateEnum.导入中.getKey());
-        excelRow.setProcessReport("");
-
-        accountingUnifiedSupplierOrderJdImportLiteVersionExcelRows.add(excelRow);
-
-        // 达到BATCH_COUNT了,需要去存储一次数据库,防止数据几万条数据在内存,容易OOM
-        if (accountingUnifiedSupplierOrderJdImportLiteVersionExcelRows.size() >= BATCH_COUNT) {
-
-            saveOrUpdateData();
-            // 存储完成清理 list
-            accountingUnifiedSupplierOrderJdImportLiteVersionExcelRows.clear();
-        }
-    }
-
-    /**
-     * 所有数据解析完成了 都会来调用
-     *
-     * @param context
-     */
-    @Override
-    public void doAfterAllAnalysed(AnalysisContext context) {
-
-        // 这里也要保存数据,确保最后遗留的数据也存储到数据库
-        saveOrUpdateData();
-
-        log.info("所有数据解析完成！");
-    }
-
-    /**
-     * 加上存储数据库
-     */
-    private void saveOrUpdateData() {
-
-        log.info("{} 条数据,开始存储数据库！\n{}",
-                accountingUnifiedSupplierOrderJdImportLiteVersionExcelRows.size(),
-                AnJsonUtils.toJson(accountingUnifiedSupplierOrderJdImportLiteVersionExcelRows)
-        );
-
-        accountingUnifiedSupplierOrderJdDubboConsumerService
-                .insertBatch4ThirdPartJdReconciliationScheduleLiteVersionExcelRowList(
-                        accountingUnifiedSupplierOrderJdImportLiteVersionExcelRows,
-                        loginSysUser
-                );
-
-        log.info("存储数据库成功！");
-    }
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/bak/AccountingUnifiedSupplierOrderJdCheckUpReportOpCompareOrderAndCheckUpProcessDimOrderOneServiceImpl.java.20220704.bak

@@ -1,667 +0,0 @@
-package cn.superdesk.uniorder.service.thirdpart.jd.impl.bak;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import cn.superdesk.uniorder.common.enums.common.CommonAccountingLockingEnum;
-import cn.superdesk.uniorder.common.enums.common.CommonAccountingStateEnum;
-import cn.superdesk.uniorder.common.enums.common.CommonOrderCompletStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskCheckStateEnum;
-import cn.superdesk.uniorder.common.enums.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum;
-import cn.superdesk.uniorder.common.lamda.AnLamdaUtils;
-import cn.superdesk.uniorder.common.numerical.AnStringUtils;
-import cn.superdesk.uniorder.dao.entity.base.UnifiedOrder;
-import cn.superdesk.uniorder.dao.entity.base.UnifiedOrderGoods;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReport;
-import cn.superdesk.uniorder.dto._constant.ResourceConstant;
-import cn.superdesk.uniorder.service.base.UnifiedOrderGoodsService;
-import cn.superdesk.uniorder.service.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportOpCompareOrderAndCheckUpProcessDimOrderOneService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
-/**
- * @Description: opCompareOrderAndCheckUpProcess 操作拆分而已
- * @Author: linjinyu
- * @CreateDate: 2022/6/29 4:07 下午
- * @UpdateUser: linjinyu
- * @UpdateDate: 2022/6/29 4:07 下午
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@RequiredArgsConstructor
-@Slf4j
-@Service
-public class AccountingUnifiedSupplierOrderJdCheckUpReportOpCompareOrderAndCheckUpProcessDimOrderOneServiceImpl
-        implements AccountingUnifiedSupplierOrderJdCheckUpReportOpCompareOrderAndCheckUpProcessDimOrderOneService {
-
-    private final UnifiedOrderGoodsService unifiedOrderGoodsService;
-
-    public List<UnifiedOrder> processOrder(UnifiedOrder orderFromDB,
-                                           List<UnifiedOrder> orderAsWholeListFromDB,
-                                           List<String> orderSnAsWhole,
-                                           List<String> orderSnAsWholeCompletStateEq1Filter,
-                                           StringBuffer processReport,
-                                           Integer processResult,
-                                           Integer defineError) {
-        // CommonOrderCompletStateEnum
-        // 已完成(1, "已完成"),
-        // 未完成(2, "未完成"),
-        // 已作废(3, "已作废"),
-
-        /**************************************** 订单完成状态 - 已完成 start ****************************************/
-
-        List<Predicate<UnifiedOrder>> predicatesByFieldCompletStateEq1 = new ArrayList<>();
-        predicatesByFieldCompletStateEq1.add(
-                r -> r.getCompletState() != null
-                        && r.getCompletState().compareTo(CommonOrderCompletStateEnum.已完成.getKey()) == 0)
-        ;
-        List<UnifiedOrder> predicatesByFieldCompletStateEq1Filter = AnLamdaUtils.filters(orderAsWholeListFromDB, predicatesByFieldCompletStateEq1);
-
-        /**************************************** 订单完成状态 - 未完成 start ****************************************/
-
-        List<Predicate<UnifiedOrder>> predicatesByFieldCompletStateEq2 = new ArrayList<>();
-        predicatesByFieldCompletStateEq2.add(
-                r -> r.getCompletState() != null
-                        && r.getCompletState().compareTo(CommonOrderCompletStateEnum.未完成.getKey()) == 0
-        );
-        List<UnifiedOrder> predicatesByFieldCompletStateEq2Filter = AnLamdaUtils.filters(orderAsWholeListFromDB, predicatesByFieldCompletStateEq2);
-
-        /**************************************** 订单完成状态 - 未完成   end ****************************************/
-
-
-        /**************************************** 订单完成状态 - 已作废 start ****************************************/
-
-        List<Predicate<UnifiedOrder>> predicatesByFieldCompletStateEq3 = new ArrayList<>();
-        predicatesByFieldCompletStateEq3.add(
-                r -> r.getCompletState() != null
-                        && r.getCompletState().compareTo(CommonOrderCompletStateEnum.已作废.getKey()) == 0
-        );
-        List<UnifiedOrder> predicatesByFieldCompletStateEq3Filter = AnLamdaUtils.filters(orderAsWholeListFromDB, predicatesByFieldCompletStateEq3);
-
-        /**************************************** 订单完成状态 - 已作废   end ****************************************/
-
-
-        /**************************************** 判定 - 订单完成状态 - 已完成 start ****************************************/
-
-        if (CollUtil.isNotEmpty(predicatesByFieldCompletStateEq1Filter)
-                && predicatesByFieldCompletStateEq1Filter.size() > 0) {
-
-            orderSnAsWholeCompletStateEq1Filter = predicatesByFieldCompletStateEq1Filter
-                    .stream()
-                    .map(UnifiedOrder::getOrderSn)
-                    .collect(Collectors.toList());
-
-            processReport.append(StrUtil.format("[doggod]判定条件:{}", "Asshole订单List[Filter=[完成状态]=[已完成]]>0;"));
-            processReport.append(StrUtil.format("信息记录:订单({}:{})存在[完成状态]=[已完成];",
-                    AnStringUtils.stringListConvertToString(
-                            orderSnAsWholeCompletStateEq1Filter
-                    ),
-                    predicatesByFieldCompletStateEq1Filter.size()
-            ));
-        }
-        //
-        else {
-            // TODO mark by linjinyu at 2022-06-29 15:54:39 - 如果已完成的订单一个也没有，是否就能直接结束了
-        }
-
-        /**************************************** 判定 - 订单完成状态 - 已完成   end ****************************************/
-
-
-        /**************************************** 判定 - 订单完成状态 - 未完成 start ****************************************/
-
-        if (CollUtil.isNotEmpty(predicatesByFieldCompletStateEq2Filter)
-                && predicatesByFieldCompletStateEq2Filter.size() > 0) {
-
-            processReport.append(StrUtil.format("[doggod]判定条件:{}", "Asshole订单List[Filter=[完成状态]=[未完成]]>0"));
-            processReport.append(StrUtil.format("信息记录:订单({}:{})存在[完成状态]=[未完成];",
-                    AnStringUtils.stringListConvertToString(
-                            predicatesByFieldCompletStateEq2Filter
-                                    .stream()
-                                    .map(UnifiedOrder::getOrderSn)
-                                    .collect(Collectors.toList())
-                    ),
-                    predicatesByFieldCompletStateEq2Filter.size()
-            ));
-            processResult = ScheduleTaskCheckStateEnum.异常.getKey();
-            defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.第三方与结算中心的对账金额不相等.getKey();
-
-        }
-
-        /**************************************** 判定 - 订单完成状态 - 未完成   end ****************************************/
-
-
-        /**************************************** 判定 - 订单完成状态 - 已作废_已取消 start ****************************************/
-
-        if (CollUtil.isNotEmpty(predicatesByFieldCompletStateEq3Filter)
-                && predicatesByFieldCompletStateEq3Filter.size() > 0) {
-
-            processReport.append(StrUtil.format("[doggod]判定条件:{}", "Asshole订单List[Filter=[完成状态]=[已作废_已取消]]>0"));
-            processReport.append(StrUtil.format("信息记录订单({}:{})存在[完成状态]=[已作废_已取消];",
-                    AnStringUtils.stringListConvertToString(
-                            predicatesByFieldCompletStateEq3Filter
-                                    .stream()
-                                    .map(UnifiedOrder::getOrderSn)
-                                    .collect(Collectors.toList())
-                    ),
-                    predicatesByFieldCompletStateEq3Filter.size()
-            ));
-            processResult = ScheduleTaskCheckStateEnum.异常.getKey();
-            defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.第三方与结算中心的对账金额不相等.getKey();
-
-        }
-
-        /**************************************** 判定 - 订单完成状态 - 已作废_已取消   end ****************************************/
-
-
-        /**************************************** TODO mark by linjinyu at 2022-06-29 15:49:35 - 此层面的好像就没有意义了 start ****************************************/
-
-        /**
-         * 按目前逻辑 mark by linjinyu at 2022-06-17 16:56:49
-         * 1. 订单维度的供应商对账状态 已对账 代表的可能性为
-         * |---- 1. 订单下全部商品 供应商对账状态 已对账
-         * |---- 2. 订单下部分商品 供应商对账状态 已对账
-         * 所以，下边还得再以订单商品维度再确认一下
-         * 2. 订单维度的供应商对账状态 已锁定 按逻辑不存在部分 订单商品锁定 因为 按京东对账 订单维度去比对 如果这个订单商品不满，就记录为异常，不锁定
-         * 以上两种情况，为了方便统计，都不会把orderSn放进去，定义的错误(defineError)可能无法表达这些问题，归结为 结算中心未找到符合条件的商品订单
-         *
-         * 下边还有补充逻辑 #结算中心 订单商品层面#
-         */
-        if (ObjectUtil.isNotNull(orderFromDB.getAccountingStateSupplier())
-                && orderFromDB.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.已对账.getKey()) == 0) {
-
-            processReport.append(StrUtil.format("[doggod]判定条件:{}", "主单[供应商对账状态]=[已对账]"));
-            processReport.append(StrUtil.format("信息记录:订单({})[对账状态]=[已对账];",
-                    orderFromDB.getOrderSn()
-            ));
-            processResult = ScheduleTaskCheckStateEnum.异常.getKey();
-            defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.第三方与结算中心的对账金额不相等.getKey();
-
-        }
-        if (ObjectUtil.isNotNull(orderFromDB.getAccountingStateSupplier())
-                && orderFromDB.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.已锁定.getKey()) == 0) {
-
-            // TODO mark by linjinyu at 2022-06-22 20:29:41 - 产品要求能对部分对账的订单 这样还不能锁订单，只能锁订单商品 [狗头]
-            processReport.append(StrUtil.format("[doggod]判定条件:{}", "主单[供应商对账状态]=[已锁定]"));
-            processReport.append(StrUtil.format("信息记录:订单({})[对账状态]=[已锁定];",
-                    orderFromDB.getOrderSn()
-            ));
-            processResult = ScheduleTaskCheckStateEnum.异常.getKey();
-            defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.第三方与结算中心的对账金额不相等.getKey();
-
-        }
-
-        /**************************************** TODO mark by linjinyu at 2022-06-29 15:49:35 - 此层面的好像就没有意义了   end ****************************************/
-
-        return predicatesByFieldCompletStateEq1Filter;
-
-    }
-
-    public List<UnifiedOrderGoods> processOrderGoods(AccountingUnifiedSupplierOrderJdCheckUpReport entityCheckUpReport,
-                                                     UnifiedOrder orderFromDB,
-                                                     List<UnifiedOrder> refundOrderListFromDB,
-                                                     List<UnifiedOrder> orderAsWholeListFromDB,
-                                                     List<String> orderSnAsWhole,
-                                                     List<String> orderSnAsWholeCompletStateEq1Filter,
-                                                     StringBuffer processReport,
-                                                     Integer processResult,
-                                                     Integer defineError) {
-
-
-        /****************************************** 结算中心 订单 商品层面 start ******************************************/
-
-        // mark by linjinyu at 2022-06-22 20:45:24 - 此处要 拉成 正负单下的所有商品
-        // ---- 只有正单商品 ---- List<UnifiedOrderGoods> orderGoodsListFromDB = unifiedOrderGoodsService.findByOrderSn(orderFromDB.getOrderSn());
-        // mark by linjinyu at 2022-06-24 15:44:41 - 修改
-        // ---- 正单退单商品 ---- 包含
-//        List<UnifiedOrderGoods> orderGoodsListFromDB = unifiedOrderGoodsService.findByOrderSns(orderSnAsWhole);
-        // ---- 正单退单(完成状态=已完成)商品 ---- 包含
-        List<UnifiedOrderGoods> orderGoodsListFromDB = unifiedOrderGoodsService.findByOrderSns(orderSnAsWholeCompletStateEq1Filter);
-
-        log.info("[doggod]processOrderGoods****************************************" +
-                        "\nentityCheckUpReport: {}" +
-                        "\norderFromDB: {}" +
-                        "\nrefundOrderListFromDB: {}" +
-                        "\norderAsWholeListFromDB: {}" +
-                        "\norderSnAsWhole: {}" +
-                        "\norderSnAsWholeCompletStateEq1Filter: {}" +
-                        "\norderGoodsListFromDB: {}" +
-                        "\nprocessReport: {}" +
-                        "\nprocessResult: {}" +
-                        "\ndefineError: {}\n****************************************",
-                JSONUtil.toJsonStr(entityCheckUpReport),
-                JSONUtil.toJsonStr(orderFromDB),
-                JSONUtil.toJsonStr(refundOrderListFromDB),
-                JSONUtil.toJsonStr(orderAsWholeListFromDB),
-                JSONUtil.toJsonStr(orderSnAsWhole),
-                JSONUtil.toJsonStr(orderSnAsWholeCompletStateEq1Filter),
-                JSONUtil.toJsonStr(orderGoodsListFromDB),
-                processReport.toString(),
-                ScheduleTaskCheckStateEnum.getDesc(processResult),
-                SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.getDesc(defineError)
-        );
-
-        String report00 = StrUtil.format("[doggod]processOrderGoods****************************************" +
-                        "\nentityCheckUpReport: {}" +
-                        "\norderFromDB: {}" +
-                        "\nrefundOrderListFromDB: {}" +
-                        "\norderAsWholeListFromDB: {}" +
-                        "\norderSnAsWhole: {}" +
-                        "\norderSnAsWholeCompletStateEq1Filter: {}" +
-                        "\norderGoodsListFromDB: {}" +
-                        "\nprocessReport: {}" +
-                        "\nprocessResult: {}" +
-                        "\ndefineError: {}\n****************************************",
-                JSONUtil.toJsonStr(entityCheckUpReport),
-                JSONUtil.toJsonStr(orderFromDB),
-                JSONUtil.toJsonStr(refundOrderListFromDB),
-                JSONUtil.toJsonStr(orderAsWholeListFromDB),
-                JSONUtil.toJsonStr(orderSnAsWhole),
-                JSONUtil.toJsonStr(orderSnAsWholeCompletStateEq1Filter),
-                JSONUtil.toJsonStr(orderGoodsListFromDB),
-                processReport.toString(),
-                ScheduleTaskCheckStateEnum.getDesc(processResult),
-                SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.getDesc(defineError));
-
-        tmpLog(
-                entityCheckUpReport.getBatchId() + "_00",
-                entityCheckUpReport.getJdOrderSn(),
-                AnStringUtils.stringListConvertToString(orderSnAsWhole),
-                report00,
-                DateUtil.now()
-        );
-
-        if (CollUtil.isEmpty(orderGoodsListFromDB)) {
-            return new ArrayList<>();
-        }
-
-        // 按 供应商对账状态 分切
-        // |---- 不对账(-1, "不对账"),
-        // |---- 已对账(1, "已对账"), // ----
-        // |---- 未对账(2, "未对账"), // ----
-        // |---- 已作废(3, "已作废"), // ---- mark by linjinyu 20200713 为了作废订单
-        // |---- 已锁定(4, "已锁定"), // ---- mark by linjinyu 20220615 为了京东对账
-
-        /**************************************** 对账的 - 排除单向结算(只留下供应商结算的) start ****************************************/
-
-        List<Predicate<UnifiedOrderGoods>> predicatesByFieldAccountingStateSupplierNotEqMinus1 = new ArrayList<>();
-        predicatesByFieldAccountingStateSupplierNotEqMinus1.add(
-                r -> r.getAccountingStateSupplier() != null
-                        && r.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.不对账.getKey()) != 0
-        );
-        List<UnifiedOrderGoods> predicatesByAccountingStateSupplierNotEqMinus1Filter = AnLamdaUtils.filters(
-                orderGoodsListFromDB,
-                predicatesByFieldAccountingStateSupplierNotEqMinus1
-        );
-
-        /**************************************** 对账的 - 排除单向结算(只留下供应商结算的)   end ****************************************/
-
-        /**************************************** 不对账 start ****************************************/
-
-        List<Predicate<UnifiedOrderGoods>> predicatesByFieldAccountingStateSupplierEqMinus1 = new ArrayList<>();
-        predicatesByFieldAccountingStateSupplierEqMinus1.add(
-                r -> r.getAccountingStateSupplier() != null
-                        && r.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.不对账.getKey()) == 0
-        );
-        List<UnifiedOrderGoods> predicatesByAccountingStateSupplierEqMinus1Filter = AnLamdaUtils.filters(
-                orderGoodsListFromDB,
-                predicatesByFieldAccountingStateSupplierEqMinus1
-        );
-
-        /**************************************** 不对账   end ****************************************/
-
-        /**************************************** 未对账 start ****************************************/
-
-        List<Predicate<UnifiedOrderGoods>> predicatesByFieldAccountingStateSupplierEq2 = new ArrayList<>();
-        predicatesByFieldAccountingStateSupplierEq2.add(
-                r -> r.getAccountingStateSupplier() != null
-                        && r.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.未对账.getKey()) == 0
-        );
-        List<UnifiedOrderGoods> predicatesByAccountingStateSupplierEq2Filter = AnLamdaUtils.filters(
-                predicatesByAccountingStateSupplierNotEqMinus1Filter,
-                predicatesByFieldAccountingStateSupplierEq2
-        );
-
-        /**************************************** 未对账   end ****************************************/
-
-        /**************************************** 未对账-非售后锁定 start ****************************************/
-
-//        goods_locking_supplier=1(锁定)
-
-        List<Predicate<UnifiedOrderGoods>> predicatesByFieldAccountingStateSupplierEq2GoodsLockingSupplierEq0 = new ArrayList<>();
-        predicatesByFieldAccountingStateSupplierEq2GoodsLockingSupplierEq0.add(
-                r -> r.getAccountingStateSupplier() != null
-                        && r.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.未对账.getKey()) == 0
-                        && r.getGoodsLockingSupplier() != null
-                        && r.getGoodsLockingSupplier().compareTo(CommonAccountingLockingEnum.正常.getKey()) == 0
-        );
-        List<UnifiedOrderGoods> predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter = AnLamdaUtils.filters(
-                predicatesByAccountingStateSupplierEq2Filter,
-                predicatesByFieldAccountingStateSupplierEq2GoodsLockingSupplierEq0
-        );
-
-        /**************************************** 未对账-非售后锁定   end ****************************************/
-
-        /**************************************** 已对账 start ****************************************/
-
-        List<Predicate<UnifiedOrderGoods>> predicatesByFieldAccountingStateSupplierEq1 = new ArrayList<>();
-        predicatesByFieldAccountingStateSupplierEq1.add(
-                r -> r.getAccountingStateSupplier() != null
-                        && r.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.已对账.getKey()) == 0
-        );
-        List<UnifiedOrderGoods> predicatesByAccountingStateSupplierEq1Filter = AnLamdaUtils.filters(
-                predicatesByAccountingStateSupplierNotEqMinus1Filter,
-                predicatesByFieldAccountingStateSupplierEq1
-        );
-
-        /**************************************** 已对账   end ****************************************/
-
-        /**************************************** 已锁定 start ****************************************/
-
-        List<Predicate<UnifiedOrderGoods>> predicatesByFieldAccountingStateSupplierEq4 = new ArrayList<>();
-        predicatesByFieldAccountingStateSupplierEq4.add(
-                r -> r.getAccountingStateSupplier() != null
-                        && r.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.已锁定.getKey()) == 0
-        );
-        List<UnifiedOrderGoods> predicatesByAccountingStateSupplierEq4Filter = AnLamdaUtils.filters(
-                predicatesByAccountingStateSupplierNotEqMinus1Filter,
-                predicatesByFieldAccountingStateSupplierEq4
-        );
-
-        /**************************************** 已锁定   end ****************************************/
-
-        Map<String, Integer> mapDoggod = new HashMap<>();
-        mapDoggod.put("非不对账", predicatesByAccountingStateSupplierNotEqMinus1Filter.size());
-        mapDoggod.put(CommonAccountingStateEnum.不对账.getDesc(), predicatesByAccountingStateSupplierEqMinus1Filter.size());
-        mapDoggod.put(CommonAccountingStateEnum.未对账.getDesc(), predicatesByAccountingStateSupplierEq2Filter.size());
-        mapDoggod.put("未对账-售后锁定(正常)", predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter.size());
-        mapDoggod.put(CommonAccountingStateEnum.已对账.getDesc(), predicatesByAccountingStateSupplierEq1Filter.size());
-        mapDoggod.put(CommonAccountingStateEnum.已锁定.getDesc(), predicatesByAccountingStateSupplierEq4Filter.size());
-
-        log.info("[doggod]{}", JSONUtil.toJsonPrettyStr(mapDoggod));
-        String report01 = StrUtil.format("[doggod]{}", JSONUtil.toJsonPrettyStr(mapDoggod));
-
-        tmpLog(
-                entityCheckUpReport.getBatchId() + "_01",
-                entityCheckUpReport.getJdOrderSn(),
-                AnStringUtils.stringListConvertToString(orderSnAsWhole),
-                report01,
-                DateUtil.now()
-        );
-
-        String report02 = StrUtil.format("[doggod]processOrderGoods" +
-                        "\n****************************************" +
-                        "\n非不对账: \n{}\n" +
-                        "\n不对账: \n{}\n" +
-                        "\n未对账: \n{}\n" +
-                        "\n未对账-售后锁定(正常): \n{}\n" +
-                        "\n已对账: \n{}\n" +
-                        "\n已锁定: \n{}\n" +
-                        "\n****************************************",
-                JSONUtil.toJsonStr(predicatesByAccountingStateSupplierNotEqMinus1Filter),
-                JSONUtil.toJsonStr(predicatesByAccountingStateSupplierEqMinus1Filter),
-                JSONUtil.toJsonStr(predicatesByAccountingStateSupplierEq2Filter),
-                JSONUtil.toJsonStr(predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter),
-                JSONUtil.toJsonStr(predicatesByAccountingStateSupplierEq1Filter),
-                JSONUtil.toJsonStr(predicatesByAccountingStateSupplierEq4Filter)
-        );
-
-        tmpLog(
-                entityCheckUpReport.getBatchId() + "_02",
-                entityCheckUpReport.getJdOrderSn(),
-                AnStringUtils.stringListConvertToString(orderSnAsWhole),
-                report02,
-                DateUtil.now()
-        );
-
-
-        entityCheckUpReport.setOrderAccountingStateSupplier(orderFromDB.getAccountingStateSupplier());
-        entityCheckUpReport.setOrderGoodsItemQuantity(orderGoodsListFromDB.size());
-        entityCheckUpReport.setGoodsAccountingStateSupplierEqMinus1(predicatesByAccountingStateSupplierEqMinus1Filter.size());
-        entityCheckUpReport.setGoodsAccountingStateSupplierEq2(predicatesByAccountingStateSupplierEq2Filter.size());
-//        entityCheckUpReport.setGoodsAccountingStateSupplierEq2(predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter.size());
-        entityCheckUpReport.setGoodsAccountingStateSupplierEq1(predicatesByAccountingStateSupplierEq1Filter.size());
-        entityCheckUpReport.setGoodsAccountingStateSupplierEq4(predicatesByAccountingStateSupplierEq4Filter.size());
-
-//                  if (CollUtil.isNotEmpty(predicatesByAccountingStateSupplierEq1Filter)) {
-//                      processReport.append(StrUtil.format("订单商品 对账状态 = 已对账({});", predicatesByAccountingStateSupplierEq1Filter.size()));
-//                      processResult = ScheduleTaskCheckStateEnum.异常.getKey();
-//                      defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.结算中心未找到符合条件的商品订单.getKey();
-//                  }
-//                  if (CollUtil.isNotEmpty(predicatesByAccountingStateSupplierEq4Filter)) {
-//                      processReport.append(StrUtil.format("订单商品 对账状态 = 已锁定({});", predicatesByAccountingStateSupplierEq4Filter.size()));
-//                      processResult = ScheduleTaskCheckStateEnum.异常.getKey();
-//                      defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.结算中心未找到符合条件的商品订单.getKey();
-//                  }
-
-        // mark by linjinyu at 2022-06-17 17:12:24 - 未对账订单商品(predicatesByAccountingStateSupplierEq2Filter) 的金额比对就不做了
-        // 不做不行 看了界面正好 为 订单结算金额 结算中心对账金额
-
-//                    // mark by linjinyu at 2022-06-21 10:23:08 - 如果存在此种情况，大概率是存在单向结算的商品
-//                    if (orderGoodsListFromDB.size() != predicatesByAccountingStateSupplierEq2Filter.size()) {
-//
-//                        log.info("[doggod]条件:{}", "意思是 订单(正负)下 所有商品'数量 != 未对账'数量");
-//
-//                        processReport.append(StrUtil.format("订单({}:{})商品 对账状态 = 不对账({}) 未对账({}) 已对账({}) 已锁定({}) 大概率是存在单向结算的商品;",
-//                                orderFromDB.getOrderSn(),
-//                                orderGoodsListFromDB.size(),
-//                                predicatesByAccountingStateSupplierEqMinus1Filter.size(),
-//                                predicatesByAccountingStateSupplierEq2Filter.size(),
-//                                predicatesByAccountingStateSupplierEq1Filter.size(),
-//                                predicatesByAccountingStateSupplierEq4Filter.size()
-//                        ));
-//                        processResult = ScheduleTaskCheckStateEnum.异常.getKey();
-//                        defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.结算中心未找到符合条件的商品订单.getKey();
-//
-//                        // 此处包含 正负单的所有 未对账 商品
-//                        BigDecimal goodsCostAmount = predicatesByAccountingStateSupplierEq2Filter
-//                                .stream()
-//                                .map(item -> item.getCostPrice() == null ? BigDecimal.ZERO : item.getCostPrice().multiply(new BigDecimal(item.getQuantity())))
-//                                .reduce(BigDecimal.ZERO, BigDecimal::add);
-//
-//                        entityCheckUpReport.setWholeOrderAmount(goodsCostAmount);
-//                        entityCheckUpReport.setComparedWholeAmount(
-//                                /* 产品要求的 这里的京东订单金额 有可能不是一个整单的金额，而是人为改的 */
-//                                entityCheckUpReport.getJdOrderAmount()
-//                                        .subtract(goodsCostAmount)
-//                        );
-//
-//                        // 意思是 订单下 能对账(非不对账)'数量 = 未对账'数量
-//                        if (predicatesByAccountingStateSupplierNotEqMinus1Filter.size() == predicatesByAccountingStateSupplierEq2Filter.size() &&
-//                                entityCheckUpReport.getJdOrderAmount().compareTo(goodsCostAmount) == 0) {
-//                            processResult = ScheduleTaskCheckStateEnum.正常.getKey();
-//                            defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.正常.getKey();
-//                        }
-//                    }
-//                    // TODO mark by linjinyu at 2022-06-27 15:34:00 - 还会有相等的情况 数据库中某订单(正负单)下的所有商品数 等于 状态为未对账商品数
-//                    else {
-//
-//                        log.info("[doggod]条件:{}", "意思是 订单(正负)下 所有商品'数量 == 未对账'数量");
-//
-//                        /**
-//                         * 这个条数相等的情况下还要分金额相等与金额不等
-//                         */
-//
-//                        // 此处包含 正负单的所有 未对账 商品
-//                        BigDecimal goodsCostAmount = predicatesByAccountingStateSupplierEq2Filter
-//                                .stream()
-//                                .map(item -> item.getCostPrice() == null ? BigDecimal.ZERO : item.getCostPrice().multiply(new BigDecimal(item.getQuantity())))
-//                                .reduce(BigDecimal.ZERO, BigDecimal::add);
-//
-//                        entityCheckUpReport.setWholeOrderAmount(goodsCostAmount);
-//                        entityCheckUpReport.setComparedWholeAmount(
-//                                /* 产品要求的 这里的京东订单金额 有可能不是一个整单的金额，而是人为改的 */
-//                                entityCheckUpReport.getJdOrderAmount()
-//                                        .subtract(goodsCostAmount)
-//                        );
-//
-//                        // 意思是 订单下 能对账'数量 = 未对账'数量
-//                        if (entityCheckUpReport.getJdOrderAmount().compareTo(goodsCostAmount) == 0) {
-//                            processResult = ScheduleTaskCheckStateEnum.正常.getKey();
-//                            defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.正常.getKey();
-//                        } else {
-//                            processResult = ScheduleTaskCheckStateEnum.异常.getKey();
-//                            defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.结算中心未找到符合条件的商品订单.getKey();
-//                        }
-//                    }
-
-        // mark by linjinyu at 2022-06-21 10:23:08 - 如果存在此种情况，大概率是存在订单维度部分商品已对账
-        // 意思是 订单下 能对账'数量 != 未对账(售后锁定(正常)(未锁定))'数量
-
-
-//        predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter
-//        predicatesByAccountingStateSupplierEq2Filter
-
-        if (predicatesByAccountingStateSupplierNotEqMinus1Filter.size() != predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter.size()) {
-
-            processReport.append(StrUtil.format("[doggod]判定条件:意思是 订单商品下 能对账'数量=>{} != 未对账(售后锁定(正常)(未锁定))'数量=>{};",
-                    predicatesByAccountingStateSupplierNotEqMinus1Filter.size(),
-                    predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter.size()
-            ));
-
-            processReport.append(StrUtil.format("记录信息:订单商品下({}:{}) 对账状态 = 不对账({}) 未对账({}) 未对账(售后锁定(正常)(未锁定))({}) 已对账({}) 已锁定({}) 大概率是存在订单维度部分商品已对账;",
-                    orderFromDB.getOrderSn(),
-                    orderGoodsListFromDB.size(),
-                    predicatesByAccountingStateSupplierEqMinus1Filter.size(),
-                    predicatesByAccountingStateSupplierEq2Filter.size(),
-                    predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter.size(),
-                    predicatesByAccountingStateSupplierEq1Filter.size(),
-                    predicatesByAccountingStateSupplierEq4Filter.size()
-            ));
-
-            processResult = ScheduleTaskCheckStateEnum.异常.getKey();
-            defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.第三方与结算中心的对账金额不相等.getKey();
-
-            // 此处包含 正单的部分 未对账 商品
-            BigDecimal goodsCostAmountAccountingStateSupplierEq2GoodsLockingSupplierEq0 = predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter
-                    .stream()
-                    .map(item -> item.getCostPrice() == null ? BigDecimal.ZERO : item.getCostPrice().multiply(new BigDecimal(item.getQuantity())))
-                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-
-            entityCheckUpReport.setWholeOrderAmount(goodsCostAmountAccountingStateSupplierEq2GoodsLockingSupplierEq0);
-            entityCheckUpReport.setComparedWholeAmount(
-                    /* 产品要求的 这里的京东订单金额 有可能不是一个整单的金额，而是人为改的 */
-                    entityCheckUpReport.getJdOrderAmount()
-                            .subtract(goodsCostAmountAccountingStateSupplierEq2GoodsLockingSupplierEq0)
-            );
-
-            // 意思是 订单下 能对账'数量 != 未对账'数量 说明存在部分对账 但如果 另外的部分未对账 金额 = 导入的 人为修改过的京东订单金额 也视为 正常
-            if (predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter.size() > 0 &&
-                    entityCheckUpReport.getJdOrderAmount().compareTo(goodsCostAmountAccountingStateSupplierEq2GoodsLockingSupplierEq0) == 0) {
-
-                processReport.append(StrUtil.format("[doggod]判定条件:意思是 订单商品下 虽然 能对账'数量=>{} != 未对账(售后锁定(正常)(未锁定))'数量=>{},但 未对账(售后锁定(正常)(未锁定))'金额=>{} = 京东'金额=>{};",
-                        predicatesByAccountingStateSupplierNotEqMinus1Filter.size(),
-                        predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter.size(),
-                        entityCheckUpReport.getJdOrderAmount(),
-                        goodsCostAmountAccountingStateSupplierEq2GoodsLockingSupplierEq0
-                ));
-                processReport.append(StrUtil.format("记录信息:部分对账情况 未对账({}) 京东金额({}) 中心金额({});",
-                        predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter.size(),
-                        entityCheckUpReport.getJdOrderAmount(),
-                        goodsCostAmountAccountingStateSupplierEq2GoodsLockingSupplierEq0
-                ));
-                processResult = ScheduleTaskCheckStateEnum.正常.getKey();
-                defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.正常.getKey();
-
-            } else if (predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter.size() == 0) {
-
-                processReport.append(StrUtil.format("[doggod]判定条件:{}", "意思是 订单商品下 能对账'数量 != 未对账(售后锁定(正常)(未锁定))'数量, 且 未对账(售后锁定(正常)(未锁定))'数量 = 0"));
-                processReport.append("#结论#[对账结果]=[异常];[差异原因]=[第三方与结算中心的对账金额不相等];");
-
-                processResult = ScheduleTaskCheckStateEnum.异常.getKey();
-                defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.第三方与结算中心的对账金额不相等.getKey();
-            }
-
-        } else {
-
-
-            processReport.append(StrUtil.format("[doggod]判定条件:{}", "意思是 订单商品下 能对账'数量 == 未对账'数量;"));
-
-            /**
-             * 这个条数相等的情况下还要分金额相等与金额不等
-             */
-
-            // 此处包含 正负单的所有 未对账 商品
-            BigDecimal goodsCostAmountAccountingStateSupplierEq2GoodsLockingSupplierEq0Else = predicatesByAccountingStateSupplierEq2GoodsLockingSupplierEq0Filter
-                    .stream()
-                    .map(item -> item.getCostPrice() == null ? BigDecimal.ZERO : item.getCostPrice().multiply(new BigDecimal(item.getQuantity())))
-                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-
-            entityCheckUpReport.setWholeOrderAmount(goodsCostAmountAccountingStateSupplierEq2GoodsLockingSupplierEq0Else);
-            entityCheckUpReport.setComparedWholeAmount(
-                    /* 产品要求的 这里的京东订单金额 有可能不是一个整单的金额，而是人为改的 */
-                    entityCheckUpReport.getJdOrderAmount()
-                            .subtract(goodsCostAmountAccountingStateSupplierEq2GoodsLockingSupplierEq0Else)
-            );
-
-            // 意思是 订单下 未对账'金额 == 京东'金额
-            if (entityCheckUpReport.getJdOrderAmount().compareTo(goodsCostAmountAccountingStateSupplierEq2GoodsLockingSupplierEq0Else) == 0) {
-
-                processReport.append(StrUtil.format("[doggod]判定条件:意思是 订单商品下 未对账'金额=>{} == 京东'金额=>{};",
-                        goodsCostAmountAccountingStateSupplierEq2GoodsLockingSupplierEq0Else,
-                        entityCheckUpReport.getJdOrderAmount()
-                ));
-                processReport.append("#结论#[对账结果]=[正常];[差异原因]=[正常];");
-
-                processResult = ScheduleTaskCheckStateEnum.正常.getKey();
-                defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.正常.getKey();
-            } else {
-
-                processReport.append(StrUtil.format("[doggod]判定条件:意思是 订单下 未对账'金额=>{} != 京东'金额=>{};",
-                        goodsCostAmountAccountingStateSupplierEq2GoodsLockingSupplierEq0Else,
-                        entityCheckUpReport.getJdOrderAmount()
-                ));
-                processReport.append("#结论#[对账结果]=[异常];[差异原因]=[第三方与结算中心的对账金额不相等];");
-
-                processResult = ScheduleTaskCheckStateEnum.异常.getKey();
-                defineError = SysQuartzScheduleTaskStatementOfAccountDefineErrorEnum.第三方与结算中心的对账金额不相等.getKey();
-            }
-        }
-
-        return predicatesByAccountingStateSupplierEq2Filter;
-
-    }
-
-
-    private final ResourceConstant resourceConstant;
-
-    private void tmpLog(String batchId,
-                        String jdOrderSn,
-                        String orderSns,
-                        String report,
-                        String now) {
-
-        String excelExportPathRoot             = resourceConstant.getPathRoot();
-        String excelExportRelativePathTemplate = resourceConstant.getPathTemplate();
-        String excelExportRelativePathStorage  = resourceConstant.getPathStorage();
-
-        String relativePath = File.separator + "thirdpart" +
-                File.separator + "jd" +
-                File.separator + "opCompareOrderAndCheckUpProcessDimOrderOne" +
-                File.separator + batchId +
-                File.separator;
-
-//		String templateRelativePath = excelExportPathRoot + excelExportRelativePathTemplate + relativePath;
-//		String templateFullPath;
-
-        String targetFullPath = excelExportPathRoot + excelExportRelativePathStorage;
-
-        // 请求记录
-        String targetResponseFileName          = StrUtil.format("{}_{}_{}.md", jdOrderSn, orderSns, now);
-        String targetResponseWriteFileFullPath = targetFullPath + relativePath + targetResponseFileName;
-        FileUtil.touch(targetResponseWriteFileFullPath);
-        FileUtil.writeUtf8String(report, targetResponseWriteFileFullPath);// CharsetUtil.CHARSET_UTF_8
-    }
-}

superdesk-uniorder-service/src/main/java/cn/superdesk/uniorder/service/thirdpart/jd/impl/bak/AccountingUnifiedSupplierOrderJdCheckUpReportServiceImpl.java.bak

@@ -1,534 +0,0 @@
-package cn.superdesk.uniorder.service.accounting.jd.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.superdesk.uniorder.common.enums.common.CommonAccountingStateEnum;
-import cn.superdesk.uniorder.common.enums.common.CommonOrderCompletStateEnum;
-import cn.superdesk.uniorder.common.enums.common.CommonProcessResultEnum;
-import cn.superdesk.uniorder.common.enums.common.CommonOrderSubjectSituationEnum;
-import cn.superdesk.uniorder.common.enums.jd.JdAfterSaleStateEnum;
-import cn.superdesk.uniorder.common.json.JsonUtils;
-import cn.superdesk.uniorder.common.rest.R;
-import cn.superdesk.uniorder.common.rest.ResponseResultUtil;
-import cn.superdesk.uniorder.dao.entity.accounting.jd.AccountingUnifiedSupplierOrderJd;
-import cn.superdesk.uniorder.dao.entity.accounting.jd.AccountingUnifiedSupplierOrderJdCheckUpReport;
-import cn.superdesk.uniorder.dao.entity.accounting.jd.AccountingUnifiedSupplierOrderJdCheckUpReportExample;
-import cn.superdesk.uniorder.dao.entity.base.UnifiedOrder;
-import cn.superdesk.uniorder.dao.entity.base.UnifiedOrderReturn;
-import cn.superdesk.uniorder.dao.mapper.accounting.jd.AccountingUnifiedSupplierOrderJdCheckUpReportMapper;
-import cn.superdesk.uniorder.dao.mapper.base.*;
-import cn.superdesk.uniorder.dto.param.accounting.jd.AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria;
-import cn.superdesk.uniorder.service.accounting.jd.AccountingUnifiedSupplierOrderJdCheckUpReportService;
-import cn.superdesk.uniorder.service.base.UnifiedOrderReturnService;
-import cn.superdesk.uniorder.service.base.UnifiedOrderService;
-import cn.superdesk.uniorder.utils.numerical.BeanUtils;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 京东对账单中的订单 算是临时 sheet eg 深圳市侨城汇网络科技有限公司-2021年8月1日集采账单.xlsx
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-14 17:04:08
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-14 17:04:08
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Service
-public class AccountingUnifiedSupplierOrderJdCheckUpReportServiceImpl implements AccountingUnifiedSupplierOrderJdCheckUpReportService {
-
-	@Autowired
-	private AccountingUnifiedSupplierOrderJdCheckUpReportMapper accountingUnifiedSupplierOrderJdCheckUpReportMapper;
-
-	/****************************************** 正单/退单 start ******************************************/
-	@Autowired
-	private UnifiedOrderMapper                   unifiedOrderMapper;
-	@Autowired
-	private UnifiedOrderMapperEx                 unifiedOrderMapperEx;
-	@Autowired
-	private UnifiedOrderMapperExSupplierDimOrder unifiedOrderMapperExSupplierDimOrder;
-	@Autowired
-	private UnifiedOrderMapperExSupplierDimGoods unifiedOrderMapperExSupplierDimGoods;
-
-	@Autowired
-	private UnifiedOrderService unifiedOrderService;
-
-	/****************************************** 退单 start ******************************************/
-
-	@Autowired
-	private UnifiedOrderReturnMapper   unifiedOrderReturnMapper;
-	@Autowired
-	private UnifiedOrderReturnMapperEx unifiedOrderReturnMapperEx;
-	@Autowired
-	private UnifiedOrderReturnService  unifiedOrderReturnService;
-
-
-	/****************************************** extends BaseService 部分 start ******************************************/
-	@Override
-	public void addObj(AccountingUnifiedSupplierOrderJdCheckUpReport entity) {
-		accountingUnifiedSupplierOrderJdCheckUpReportMapper.insert(entity);
-	}
-
-	@Override
-	public void updateObj(AccountingUnifiedSupplierOrderJdCheckUpReport entity) {
-		accountingUnifiedSupplierOrderJdCheckUpReportMapper.updateByPrimaryKeySelective(entity);
-	}
-
-	@Override
-	public void deleteObj(Long id) {
-	}
-
-	@Override
-	public AccountingUnifiedSupplierOrderJdCheckUpReport findById(Long id) {
-		return accountingUnifiedSupplierOrderJdCheckUpReportMapper.selectByPrimaryKey(id);
-	}
-
-	@Override
-	public PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReport> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-		return null;
-	}
-
-	@Override
-	public List<AccountingUnifiedSupplierOrderJdCheckUpReport> findAll(Map<String, Object> queryMap) {
-		return null;
-	}
-
-	/****************************************** extends BaseService 部分   end ******************************************/
-
-
-	public void addAccountingUnifiedSupplierOrderJdCheckUpReport(AccountingUnifiedSupplierOrderJdCheckUpReport entity) {
-		accountingUnifiedSupplierOrderJdCheckUpReportMapper.insertSelective(entity);
-	}
-
-	public void updateAccountingUnifiedSupplierOrderJdCheckUpReport(AccountingUnifiedSupplierOrderJdCheckUpReport entity) {
-		AccountingUnifiedSupplierOrderJdCheckUpReport originEntity = accountingUnifiedSupplierOrderJdCheckUpReportMapper.selectByPrimaryKey(entity.getId());
-//		AssertUtil.notNull(originEntity);
-		BeanUtils.copy(entity, originEntity);
-		accountingUnifiedSupplierOrderJdCheckUpReportMapper.updateByPrimaryKey(originEntity);
-	}
-
-	public void deleteAccountingUnifiedSupplierOrderJdCheckUpReport(Long id) {
-		accountingUnifiedSupplierOrderJdCheckUpReportMapper.deleteByPrimaryKey(id);
-	}
-
-	public AccountingUnifiedSupplierOrderJdCheckUpReport findAccountingUnifiedSupplierOrderJdCheckUpReportById(Long id) {
-		AccountingUnifiedSupplierOrderJdCheckUpReport entity = accountingUnifiedSupplierOrderJdCheckUpReportMapper.selectByPrimaryKey(id);
-//		AssertUtil.notNull(entity);
-		return entity;
-	}
-
-	public AccountingUnifiedSupplierOrderJdCheckUpReport findByBatchIdJdOrderSn(String batchId, String jdOrderSn) {
-
-		AccountingUnifiedSupplierOrderJdCheckUpReportExample          example  = new AccountingUnifiedSupplierOrderJdCheckUpReportExample();
-		AccountingUnifiedSupplierOrderJdCheckUpReportExample.Criteria criteria = example.createCriteria();
-
-		criteria
-				.andBatchIdEqualTo(batchId)
-				.andJdOrderSnEqualTo(jdOrderSn);
-
-		List<AccountingUnifiedSupplierOrderJdCheckUpReport> resultList = accountingUnifiedSupplierOrderJdCheckUpReportMapper.selectByExampleWithBLOBs(example);
-
-		if (CollUtil.isNotEmpty(resultList)) {
-			return resultList.get(0);
-		} else {
-			return null;
-		}
-
-	}
-
-	public R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize) {
-
-		AccountingUnifiedSupplierOrderJdCheckUpReportExample          example  = new AccountingUnifiedSupplierOrderJdCheckUpReportExample();
-		AccountingUnifiedSupplierOrderJdCheckUpReportExample.Criteria criteria = example.createCriteria();
-
-		// TODO 喜欢用Map 还是 Bean 自己喜欢... 后期添加 转 AccountingUnifiedSupplierOrderJdCheckUpReportExample.Criteria
-		// AccountingUnifiedSupplierOrderJdCheckUpReport accountingUnifiedSupplierOrderJdCheckUpReportConditions = BeanUtils.mapToBean(conditions,AccountingUnifiedSupplierOrderJdCheckUpReport.class);
-
-		PageHelper.startPage(pageNun, pageSize);
-		List<AccountingUnifiedSupplierOrderJdCheckUpReport>     resultList = accountingUnifiedSupplierOrderJdCheckUpReportMapper.selectByExample(example);
-		PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReport> page       = new PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReport>(resultList);
-		PageHelper.clearPage();
-
-		return new R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>>(page.getPageNum(), page.getPageSize(), (int) page.getTotal(), resultList);
-
-	}
-
-	public R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>> pageQueryGenericParam(AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria) {
-
-		AccountingUnifiedSupplierOrderJdCheckUpReportExample          example  = new AccountingUnifiedSupplierOrderJdCheckUpReportExample();
-		AccountingUnifiedSupplierOrderJdCheckUpReportExample.Criteria criteria = example.createCriteria();
-
-		// TODO 添加条件... 后期添加 queryCriteria 转 AccountingUnifiedSupplierOrderJdCheckUpReportExample.Criteria
-
-		PageHelper.startPage(queryCriteria.getPageNumber(), queryCriteria.getPageSize());
-
-		List<AccountingUnifiedSupplierOrderJdCheckUpReport> resultList = accountingUnifiedSupplierOrderJdCheckUpReportMapper.selectByExample(example);
-
-		PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReport> page = new PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReport>(resultList);
-		PageHelper.clearPage();
-
-		return new R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>>(page.getPageNum(), page.getPageSize(), (int) page.getTotal(), resultList);
-
-	}
-
-
-	/****************************************** 检查 start ******************************************/
-
-
-	/**
-	 * 单个检查
-	 *
-	 * @param entityImportRow
-	 * @return
-	 */
-	public R<String> checkUpReport(AccountingUnifiedSupplierOrderJd entityImportRow) {
-
-		try {
-
-			// TODO 1. 比对 订单金额 2. 统一订单中的完成状态 3. 统一订单的商品 供应商对账状态 mark by linjinyu at 20211014
-
-			// 只能去侨城汇生产环境先验证sql
-			// SELECT * FROM `unified_order` WHERE express_sn = '215952302659'
-
-
-			AccountingUnifiedSupplierOrderJdCheckUpReport entityCheckUpReport = null;
-
-			entityCheckUpReport = findByBatchIdJdOrderSn(entityImportRow.getBatchId(), entityImportRow.getJdOrderSn());
-
-			if (ObjectUtil.isNull(entityCheckUpReport)) {
-				entityCheckUpReport = new AccountingUnifiedSupplierOrderJdCheckUpReport();
-			}
-
-
-//			entityCheckUpReport.setId(entityImportRow.getId());
-			entityCheckUpReport.setBatchId(entityImportRow.getBatchId());
-
-			/****************************************** 京东对账单 - 订单信息 start ******************************************/
-
-			entityCheckUpReport.setJdAccountingOrderSn(entityImportRow.getJdAccountingOrderSn());
-
-			entityCheckUpReport.setJdOrderSn(entityImportRow.getJdOrderSn());
-			entityCheckUpReport.setJdOriginalOrderSn(entityImportRow.getJdOriginalOrderSn());
-			entityCheckUpReport.setJdOrderAmount(entityImportRow.getJdOrderAmount());
-			entityCheckUpReport.setJdRepaymentAmount(entityImportRow.getJdRepaymentAmount());
-			entityCheckUpReport.setJdRefundAmount(entityImportRow.getJdRefundAmount());
-			entityCheckUpReport.setJdOutStandingAmount(entityImportRow.getJdOutStandingAmount());
-			entityCheckUpReport.setJdOrderState(entityImportRow.getJdOrderState());
-			entityCheckUpReport.setJdOrderStateName(entityImportRow.getJdOrderStateName());
-			entityCheckUpReport.setWereAccountedState(entityImportRow.getWereAccountedState());
-			entityCheckUpReport.setWereAccountedStateName(entityImportRow.getWereAccountedStateName());
-			entityCheckUpReport.setAfterSaleState(entityImportRow.getAfterSaleState());
-			entityCheckUpReport.setAfterSaleStateName(entityImportRow.getAfterSaleStateName());
-
-			/****************************************** 京东对账单 - 订单信息   end ******************************************/
-
-			/****************************************** 统一订单 start ******************************************/
-
-			StringBuffer processReport = new StringBuffer();
-			Integer      processResult = CommonProcessResultEnum.初始.getKey();
-
-			UnifiedOrder orderFromDB = unifiedOrderMapperEx.findByJdOrderSn(entityImportRow.getJdOrderSn());
-
-			// 情况1 :  订单都没找到
-			if (ObjectUtil.isNull(orderFromDB)) {
-
-				entityCheckUpReport.setOrderSn("NO_FOUND");
-
-				entityCheckUpReport.setOrderAmount(BigDecimal.ZERO);
-				entityCheckUpReport.setOrderCostAmount(BigDecimal.ZERO);
-
-				entityCheckUpReport.setRefundOrderAmount(BigDecimal.ZERO);
-				entityCheckUpReport.setRefundOrderCostAmount(BigDecimal.ZERO);
-
-				entityCheckUpReport.setTransportAmount(BigDecimal.ZERO);
-				entityCheckUpReport.setTransportMerchantAssumeAmount(BigDecimal.ZERO);
-
-				entityCheckUpReport.setGoodsAmount(BigDecimal.ZERO);
-				entityCheckUpReport.setGoodsCostAmount(BigDecimal.ZERO);
-
-				entityCheckUpReport.setRefundGoodsAmount(BigDecimal.ZERO);
-				entityCheckUpReport.setRefundGoodsCostAmount(BigDecimal.ZERO);
-
-				entityCheckUpReport.setOrderState(0);
-				entityCheckUpReport.setCompletState(0);
-
-				processReport.append("订单 No Found;同步京东订单;");
-				processResult = CommonProcessResultEnum.异常_数据本身问题.getKey();
-
-			}
-			// 情况1 :  订单找到后才能开始做判定逻辑
-			else {
-
-				entityCheckUpReport.setOrderSn(orderFromDB.getOrderSn());
-
-				entityCheckUpReport.setOrderAmount(orderFromDB.getAmount());
-				entityCheckUpReport.setOrderCostAmount(orderFromDB.getCostAmount());
-
-				entityCheckUpReport.setTransportAmount(orderFromDB.getTransportAmount());
-				entityCheckUpReport.setTransportMerchantAssumeAmount(orderFromDB.getTransportMerchantAssumeAmount());
-
-				entityCheckUpReport.setGoodsAmount(orderFromDB.getGoodsAmount());
-				entityCheckUpReport.setGoodsCostAmount(orderFromDB.getGoodsCostAmount());
-
-				// TODO 退单相关字段先初始化 后边再验证
-				entityCheckUpReport.setRefundOrderAmount(BigDecimal.ZERO);
-				entityCheckUpReport.setRefundOrderCostAmount(BigDecimal.ZERO);
-
-				entityCheckUpReport.setRefundGoodsAmount(BigDecimal.ZERO);
-				entityCheckUpReport.setRefundGoodsCostAmount(BigDecimal.ZERO);
-
-				entityCheckUpReport.setOrderState(orderFromDB.getOrderState());
-				entityCheckUpReport.setCompletState(orderFromDB.getCompletState());
-
-
-				/****************************************** 统一订单 订单层面 start ******************************************/
-
-				// 已完成(1,"已完成"), 未完成(2,"未完成"), 已作废(3,"已作废"),
-				if (ObjectUtil.isNotNull(orderFromDB.getCompletState())
-						&& orderFromDB.getCompletState().compareTo(CommonOrderCompletStateEnum.已作废.getKey()) == 0) {
-
-					processReport.append("订单 CompletState = 已作废_已取消;");
-					processResult = CommonProcessResultEnum.异常_数据本身问题.getKey();
-
-				}
-
-				if (ObjectUtil.isNotNull(orderFromDB.getAccountingStateSupplier())
-						&& orderFromDB.getAccountingStateSupplier().compareTo(CommonAccountingStateEnum.已对账.getKey()) == 0) {
-
-					processReport.append("订单 供应商对账状态 = 已对账;");
-					processResult = CommonProcessResultEnum.异常_数据本身问题.getKey();
-
-				}
-
-				/****************************************** 统一订单 订单层面   end ******************************************/
-
-				switch (JdAfterSaleStateEnum.getByDesc(entityImportRow.getAfterSaleStateName())) {
-
-
-					case 已进售后:
-
-					case 售后完成:
-
-						// 思路还是要改 相信京东 京东已经告诉你 有售后
-
-//						/****************************************** 订单 ---- 订单商品层面 start ******************************************/
-//
-//						// TODO ... 看情况要不要商品维度重新算
-//
-//						/****************************************** 订单 ---- 退单层面 可能要作兼容 可能包含 当时单主体 与 双主体情况 start ******************************************/
-//
-//						// 证明是 双主体情况 正单 退单 独立存在
-//						if (ObjectUtil.isNotNull(orderFromDB.getRefundOrderSn())) {
-//
-//
-//							UnifiedOrder refundOrderForSubjectDouble = unifiedOrderService.findByOrderSn(orderFromDB.getRefundOrderSn()); // unifiedOrderMapperEx.findByOrderSn(orderFromDB.getRefundOrderSn());
-//
-//							if (ObjectUtil.isNull(refundOrderForSubjectDouble)) {
-//
-//								processReport.append("退单 No Found;同步京东订单");
-//								processResult = CommonProcessResultEnum.异常_数据本身问题.getKey();
-//
-//							} else {
-//
-//								entityCheckUpReport.setRefundOrderAmount(refundOrderForSubjectDouble.getAmount());
-//								entityCheckUpReport.setRefundOrderCostAmount(refundOrderForSubjectDouble.getCostAmount());
-//
-//								entityCheckUpReport.setRefundGoodsAmount(refundOrderForSubjectDouble.getGoodsAmount());
-//								entityCheckUpReport.setRefundGoodsCostAmount(refundOrderForSubjectDouble.getGoodsCostAmount());
-//							}
-//
-//						}
-//						// 证明是 单主体情况 退单商品作为 负方向 存在
-//						else {
-//
-//							UnifiedOrderReturn refundOrderForSubjectSingle = unifiedOrderReturnService.getByOrderSn(orderFromDB.getOrderSn());
-//
-//							if (ObjectUtil.isNull(refundOrderForSubjectSingle)) {
-//
-//								processReport.append("退单 No Found;同步京东订单");
-//								processResult = CommonProcessResultEnum.异常_数据本身问题.getKey();
-//
-//							} else {
-//
-//								/****************************************** TODO 此处可能要一层层修正 start ******************************************/
-//
-////								refundOrderForSubjectSingle.getAmount();
-////								refundOrderForSubjectSingle.getCostAmount();
-////
-////								refundOrderForSubjectSingle.getGoodsAmount();
-////								refundOrderForSubjectSingle.getGoodsCostAmount();
-////
-////								refundOrderForSubjectSingle.getRefundGoodsAmount();
-////								refundOrderForSubjectSingle.getRefundGoodsCostAmount();
-//
-//								/****************************************** TODO 此处可能要一层层修正   end ******************************************/
-//
-//								// TODO 统一订单 没有这两个字段 存在问题
-//								entityCheckUpReport.setRefundOrderAmount(refundOrderForSubjectSingle.getAmount());
-//								entityCheckUpReport.setRefundOrderCostAmount(refundOrderForSubjectSingle.getCostAmount());
-//
-//								entityCheckUpReport.setRefundGoodsAmount(refundOrderForSubjectSingle.getRefundGoodsAmount());
-//								entityCheckUpReport.setRefundGoodsCostAmount(refundOrderForSubjectSingle.getRefundGoodsCostAmount());
-//							}
-//
-//
-////				        orderFromDB.getRefundGoodsCostAmount() 要求要等于 AccountingUnifiedSupplierOrderJd entityImportRow.jdRefundAmount
-//						}
-
-						break;
-
-					case 未进售后:
-						break;
-					case UNKNOW:
-
-						processReport.append("售后状态-目前只能处理京东售后状态为(未进售后|售后完成|已进售后),超出处理范围;");
-						processResult = CommonProcessResultEnum.异常_数据本身问题.getKey();
-						break;
-				}
-
-
-				// afterSaleStateName 售后状态 未进售后 售后完成 已进售后
-				// jdOrderStateName 京东 订单状态 已完成 部分退货
-				// wereAccountedStateName 京东 入账状态 已入账
-				// settledStateName 京东 结清状态 未结清
-
-//					京东 : 订单金额 - 退款金额 - 还款金额 = 未结清(应付)
-//					判定 : 订单金额(京东 jdOrderAmount) 按理等于 订单成本金额(统一 orderCostAmount)
-//					判定 : 订单金额(京东 jdOrderAmount) - 退款金额(京东 jdRefundAmount) 按理等于 订单成本金额(统一 orderCostAmount) - 退款成本金额(统一 refundGoodsCostAmount)
-
-//					SELECT
-//						*
-//					FROM
-//						accounting_unified_supplier_order_jd_check_up_report
-//					WHERE
-//						process_result = 2
-//						AND after_sale_state_name in ('售后完成','已进售后')
-//						AND process_report LIKE '订单差异金额%'
-
-//					问题样例
-//					京东 子单 213037923494
-//					京东 主单 213026092641
-//					商城 单号 ME20210709214104186712
-
-
-				/****************************************** 注意 以下判定未考量 京东 还款金额 大于 0.00 的情况，假定没有这样的情况 start ******************************************/
-
-
-//					1. 问题记录 getOrderCostAmount 有的等于 有的不等于 getTransportMerchantAssumeAmount + getGoodsCostAmount 这种问题存在于 大概是 运费双向结算的订单 要再进一步验证
-//					2. getTransportMerchantAssumeAmount + getGoodsCostAmount = getJdOrderAmount
-
-//					SELECT
-//					    `id`,
-//					    `batch_id`,
-//					    `jd_accounting_order_sn`,
-//					    `jd_order_sn`,
-//					    `jd_original_order_sn`,
-//					    `order_sn`,
-//					    `jd_order_amount`,
-//					    `jd_repayment_amount`,
-//					    `jd_refund_amount`,
-//					    `jd_out_standing_amount`,
-//					    `order_cost_amount`,
-//					    `refund_order_cost_amount`,
-//					    `transport_merchant_assume_amount`,
-//					    `goods_cost_amount`,
-//					    `refund_goods_cost_amount`,
-//					    `order_state`,
-//					    `complet_state`,
-//					    `create_time`,
-//					    `process_result`,
-//					    `process_report`
-//					FROM
-//					    `accounting_unified_supplier_order_jd_check_up_report`
-//					WHERE
-//					    `process_result` = 1
-
-				if (entityCheckUpReport.getJdOrderAmount().compareTo(
-						entityCheckUpReport.getGoodsCostAmount().add(entityCheckUpReport.getTransportMerchantAssumeAmount())
-				) == 0
-						&& entityCheckUpReport.getJdRefundAmount().compareTo(entityCheckUpReport.getRefundOrderCostAmount()) == 0
-						&& entityCheckUpReport.getJdRefundAmount().compareTo(entityCheckUpReport.getRefundGoodsCostAmount()) == 0) {
-
-					processReport.append("");
-					processResult = CommonProcessResultEnum.正常.getKey();
-
-				}
-
-//					差异金额：列表中的“京东结算金额”减“订单结算金额”
-
-				if (entityCheckUpReport.getJdOrderAmount().compareTo(
-						entityCheckUpReport.getGoodsCostAmount().add(entityCheckUpReport.getTransportMerchantAssumeAmount())
-				) != 0) {
-
-					processReport.append(StrUtil.format("订单差异金额 {}; 排查订单明细，找出金额异常原因;",
-							entityCheckUpReport.getJdOrderAmount().subtract(
-									entityCheckUpReport.getGoodsCostAmount().add(entityCheckUpReport.getTransportMerchantAssumeAmount())
-							)));
-					processResult = CommonProcessResultEnum.异常_数据本身问题.getKey();
-
-				}
-
-				if (entityCheckUpReport.getJdRefundAmount().compareTo(entityCheckUpReport.getRefundOrderCostAmount()) != 0
-						|| entityCheckUpReport.getJdRefundAmount().compareTo(entityCheckUpReport.getRefundGoodsCostAmount()) != 0) {
-
-					processReport.append(StrUtil.format("退款差异金额 {} {}; 排查订单明细，找出金额异常原因;",
-							entityCheckUpReport.getJdRefundAmount().subtract(entityCheckUpReport.getRefundOrderCostAmount()),
-							entityCheckUpReport.getJdRefundAmount().subtract(entityCheckUpReport.getRefundGoodsCostAmount())));
-
-					processResult = CommonProcessResultEnum.异常_数据本身问题.getKey();
-
-				}
-
-
-			}
-
-//		entityCheckUpReport.setOrderSn();
-//		entityCheckUpReport.setOrderAmount();
-//		entityCheckUpReport.setOrderCostAmount();
-//		entityCheckUpReport.setTransportAmount();
-//		entityCheckUpReport.setTransportMerchantAssumeAmount();
-//		entityCheckUpReport.setGoodsAmount();
-//		entityCheckUpReport.setGoodsCostAmount();
-//		entityCheckUpReport.setRefundAmount();
-//		entityCheckUpReport.setRefundGoodsAmount();
-//		entityCheckUpReport.setRefundGoodsCostAmount();
-//		entityCheckUpReport.setOrderState();
-//		entityCheckUpReport.setCompletState();
-
-			/****************************************** 报告 start ******************************************/
-
-
-			entityCheckUpReport.setProcessResult(processResult);
-			entityCheckUpReport.setProcessReport(processReport.toString());
-
-			if (ObjectUtil.isNull(entityCheckUpReport.getId())) {
-
-				entityCheckUpReport.setCreateTime(DateUtil.date());
-				accountingUnifiedSupplierOrderJdCheckUpReportMapper.insertSelective(entityCheckUpReport);
-			} else {
-				entityCheckUpReport.setCreateTime(DateUtil.date());
-				accountingUnifiedSupplierOrderJdCheckUpReportMapper.updateByPrimaryKeyWithBLOBs(entityCheckUpReport);
-			}
-
-			log.info("checkUpReport {}", JsonUtils.toJson(entityImportRow));
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-
-
-		return ResponseResultUtil.createSuccesResult();
-	}
-
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/controller/_thirdpart/jd/AccountingUnifiedSupplierOrderJdCheckUpReportController.java

@@ -1,182 +0,0 @@
-package cn.superdesk.uniorder.controller._thirdpart.jd;
-
-import cn.hutool.core.util.ObjectUtil;
-import cn.superdesk.libs.common.json.JsonUtils;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.rest.response.ResponseResultOuterUtils;
-import cn.superdesk.uniorder.controller.base.BaseController;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReport;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportParam;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdListItemVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdListItemVo;
-import cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService;
-import cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * @Description: 京东对账单中的订单 算是临时 sheet eg 深圳市侨城汇网络科技有限公司-2021年8月1日集采账单.xlsx
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-14 17:04:08
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-14 17:04:08
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Api(value = "供应商结算-京东对账-op对账详情", tags = {"供应商结算-京东对账-op对账详情"})
-@Slf4j
-@RestController
-@RequestMapping("/accountingUnifiedSupplierOrderJdCheckUpReport")
-public class AccountingUnifiedSupplierOrderJdCheckUpReportController extends BaseController {
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService;
-
-    @Autowired
-    private SysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService;
-
-//	@ApiOperation(value = "分页查询 - 默认不用")
-//	@RequestMapping(value = "listByObscure", method = RequestMethod.POST)
-//	@ResponseBody
-//	public R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>> pageQueryAccountingUnifiedSupplierOrderJdCheckUpReport(@RequestBody PageQueryParam param) {
-//
-//		log.info("pageQueryAccountingUnifiedSupplierOrderJdCheckUpReport:\n{}", JsonUtils.toJson(param));
-//
-//		R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>> result = new R<>();
-//
-//		// TODO 参数合法性判定
-//
-//		result = accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService.pageQuery(param.getConditions(), param.getPageNo(), param.getPageSize());
-//
-//		return result;
-//	}
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op查看对账(对账详情)")
-    @RequestMapping(value = "list", method = RequestMethod.POST)
-    @ResponseBody
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo>> pageQueryGenericParamAccountingUnifiedSupplierOrderJdCheckUpReport(
-            @RequestBody AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria) {
-
-        log.info("供应商结算-京东对账-op列表-op查看对账 params:\n{}", JsonUtils.toJson(queryCriteria));
-
-        R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo>> result = new R<>();
-
-        // TODO 参数合法性判定
-
-        if (ObjectUtil.isNull(queryCriteria.getBatchId())) {
-            return ResponseResultOuterUtils.createErrorResult("500", "[参数异常]对账单号");
-        }
-
-        result = accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService.pageQueryGenericParam(queryCriteria, getToken());
-
-        return result;
-    }
-
-    @ApiOperation(value = "按id查询")
-    @RequestMapping(value = "{id}", method = RequestMethod.GET)
-    @ResponseBody
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>> getById(@PathVariable("id") long id) {
-
-        R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>> result = new R<>();
-
-        // TODO 参数合法性判定
-
-        AccountingUnifiedSupplierOrderJdCheckUpReport entity = accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService.findAccountingUnifiedSupplierOrderJdCheckUpReportById(id);
-
-        List<AccountingUnifiedSupplierOrderJdCheckUpReport> data = new ArrayList<>();
-        data.add(entity);
-
-        result.setData(data);
-
-        return result;
-    }
-
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "add", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> addAccountingUnifiedSupplierOrderJdCheckUpReport(@RequestBody AccountingUnifiedSupplierOrderJdCheckUpReportParam param) {
-
-        log.info("addAccountingUnifiedSupplierOrderJdCheckUpReport:\n{}", JsonUtils.toJson(param));
-
-        // TODO 参数合法性判定
-
-        accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService.addAccountingUnifiedSupplierOrderJdCheckUpReport(param);
-
-        return new R<>("200", "操作成功", true);
-    }
-
-
-    @ApiOperation(value = "检查")
-    @RequestMapping(value = "checkUpAndReportDimOrder", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> checkUpAndReportDimOrder(@RequestBody AccountingUnifiedSupplierOrderJdListItemVo itemVo) {
-
-        log.info("checkUpReport:\n{}", JsonUtils.toJson(itemVo));
-
-        // TODO 参数合法性判定
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.findListItemVoByBatchId(
-                itemVo.getBatchId(),
-                getToken()
-        );
-
-        if (ObjectUtil.isNull(listItemVo)) {
-            return ResponseResultOuterUtils.createErrorResult("500", "未查找到任务");
-        }
-
-        accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService.checkUpAndReportDimOrder(listItemVo, itemVo);
-
-        return new R<>("200", "操作成功", true);
-    }
-
-    @ApiOperation(value = "更新")
-    @RequestMapping(value = "update", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> updateAccountingUnifiedSupplierOrderJdCheckUpReport(@RequestBody AccountingUnifiedSupplierOrderJdCheckUpReportParam param) {
-
-        log.info("updateAccountingUnifiedSupplierOrderJdCheckUpReport:\n{}", JsonUtils.toJson(param));
-
-        accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService.updateAccountingUnifiedSupplierOrderJdCheckUpReport(param);
-
-        return new R<>("200", "操作成功", true);
-    }
-
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "delete/{id}", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> deleteAccountingUnifiedSupplierOrderJdCheckUpReport(@PathVariable("id") long id) {
-
-        // TODO 参数合法性判定
-
-        accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService.deleteAccountingUnifiedSupplierOrderJdCheckUpReport(id);
-
-        return new R<>("200", "操作成功", true);
-    }
-
-    @ApiOperation(value = "批量删除")
-    @RequestMapping(value = "delete_ids", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> deleteIdsAccountingUnifiedSupplierOrderJdCheckUpReport(@RequestParam(value = "ids") long[] ids) {
-
-        log.info(JsonUtils.toJson(ids));
-
-        for (long id : ids) {
-            accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService.deleteAccountingUnifiedSupplierOrderJdCheckUpReport(id);
-        }
-
-        return new R<>("200", "操作成功", true);
-
-    }
-
-
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/controller/_thirdpart/jd/AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelController.java

@@ -1,67 +0,0 @@
-package cn.superdesk.uniorder.controller._thirdpart.jd;
-
-import cn.hutool.json.JSONUtil;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.controller.base.BaseController;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria;
-import cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-
-/**
- * @Description: 京东对账单中的订单 算是临时 sheet eg 深圳市侨城汇网络科技有限公司-2021年8月1日集采账单.xlsx
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-14 17:04:08
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-14 17:04:08
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Api(value = "供应商结算-京东对账-op对账详情-op导出", tags = {"供应商结算-京东对账-op对账详情-op导出"})
-@Slf4j
-@RestController
-@RequestMapping("/accountingUnifiedSupplierOrderJdCheckUpReport/export")
-public class AccountingUnifiedSupplierOrderJdCheckUpReportExportExcelController extends BaseController {
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService;
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op查看对账(对账详情)-op导出列表(完整版 Full Version)-京东账单任务-某次导入数据-报告导出")
-    @RequestMapping(value = "/excel/jdCheckUpReport/fullVersion", method = RequestMethod.POST)
-    public R<String> exportExcelJdCheckUpReportFullVersion(
-            @RequestBody AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria criteria) {
-
-        log.info("供应商结算-京东对账-op列表-op查看对账(对账详情)-op导出列表(完整版 Full Version)-京东账单任务-某次导入数据-报告导出 params: \n{}", JSONUtil.toJsonStr(criteria));
-
-        return new R<String>(accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService
-                .exportExcelJdCheckUpReportFullVersion(
-                        criteria,
-                        getToken()
-                )
-        );
-    }
-
-	@ApiOperation(value = "供应商结算-京东对账-op列表-op查看对账(对账详情)-op导出列表(精简版 Lite Version)-京东账单任务-某次导入数据-报告导出")
-	@RequestMapping(value = "/excel/jdCheckUpReport/liteVersion", method = RequestMethod.POST)
-	public R<String> exportExcelJdCheckUpReportLiteVersion(
-	        @RequestBody AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria criteria) {
-
-		log.info("供应商结算-京东对账-op列表-op查看对账(对账详情)-op导出列表(精简版 Lite Version)-京东账单任务-某次导入数据-报告导出 params: \n{}", JSONUtil.toJsonStr(criteria));
-
-		return new R<String>(accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService
-                .exportExcelJdCheckUpReportLiteVersion(
-                        criteria,
-                        getToken()
-                )
-        );
-	}
-
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/controller/_thirdpart/jd/AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsController.java

@@ -1,157 +0,0 @@
-package cn.superdesk.uniorder.controller._thirdpart.jd;
-
-import cn.superdesk.libs.common.json.JsonUtils;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.rest.response.ResponseResultOuterUtils;
-import cn.superdesk.uniorder.controller.base.BaseController;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsHeadVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo;
-import cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsDubboConsumerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-/**
- * @Description:
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2022-06-22 16:27:47
- * @UpdateUser: linjinyu
- * @UpdateDate: 2022-06-22 16:27:47
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Api(value = "xxx-xxx", tags = {"xxx-xxx"})
-@Slf4j
-@RestController
-@RequestMapping("/accountingUnifiedSupplierOrderJdCheckUpReportXGoods")
-public class AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsController extends BaseController {
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsDubboConsumerService accountingUnifiedSupplierOrderJdCheckUpReportXGoodsDubboConsumerService;
-
-
-    @ApiOperation(value = "xxx-xxx-op列表")
-    @RequestMapping(value = "list", method = RequestMethod.POST)
-    @ResponseBody
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo>> pageQueryGenericParam(
-            @RequestBody AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria) {
-
-        log.info("pageQueryAccountingUnifiedSupplierOrderJdCheckUpReportXGoods:\n{}", JsonUtils.toJson(queryCriteria));
-
-        // TODO 参数合法性判定
-
-        R<List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo>> result = new R<>();
-        result = accountingUnifiedSupplierOrderJdCheckUpReportXGoodsDubboConsumerService.pageQueryGenericParam(queryCriteria, getToken());
-
-        return result;
-    }
-
-    @ApiOperation(value = "xxx-xxx-op页头")
-    @RequestMapping(value = "head", method = RequestMethod.POST)
-    public R<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsHeadVo> pageQueryHeadGenericParam(
-            @RequestBody AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria) {
-
-        return ResponseResultOuterUtils.createSuccesResult("",
-                accountingUnifiedSupplierOrderJdCheckUpReportXGoodsDubboConsumerService
-                        .queryHeadGenericParam(
-                                queryCriteria,
-                                getToken()
-                        )
-        );
-    }
-
-    @ApiOperation(value = "xxx-xxx-op列表-op按id查询")
-    @RequestMapping(value = "{id}", method = RequestMethod.GET)
-    @ResponseBody
-    public R<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo> getById(@PathVariable("id") long id) {
-
-        return ResponseResultOuterUtils.createSuccesResult("",
-                accountingUnifiedSupplierOrderJdCheckUpReportXGoodsDubboConsumerService
-                        .findListItemVoById(
-                                id,
-                                getToken()
-                        )
-        );
-    }
-
-    @ApiOperation(value = "xxx-xxx-op列表-op新增-op提交")
-    @RequestMapping(value = "add", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> addAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(@RequestBody AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam param) {
-
-        log.info("addAccountingUnifiedSupplierOrderJdCheckUpReportXGoods:\n{}", JsonUtils.toJson(param));
-
-        // TODO 参数合法性判定
-
-        int ret = accountingUnifiedSupplierOrderJdCheckUpReportXGoodsDubboConsumerService.addAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(param, getToken());
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "操作失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("操作成功");
-        }
-    }
-
-    @ApiOperation(value = "xxx-xxx-op列表-op编辑-op提交")
-    @RequestMapping(value = "update", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> updateAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(@RequestBody AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam param) {
-
-        log.info("updateAccountingUnifiedSupplierOrderJdCheckUpReportXGoods:\n{}", JsonUtils.toJson(param));
-
-        int ret = accountingUnifiedSupplierOrderJdCheckUpReportXGoodsDubboConsumerService.updateAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(param, getToken());
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "操作失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("操作成功");
-        }
-    }
-
-    @ApiOperation(value = "xxx-xxx-op列表-op删除")
-    @RequestMapping(value = "delete/{id}", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> deleteAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(@PathVariable("id") long id) {
-
-        // TODO 参数合法性判定
-
-        int ret = accountingUnifiedSupplierOrderJdCheckUpReportXGoodsDubboConsumerService.deleteAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(id, getToken());
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "操作失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("操作成功");
-        }
-    }
-
-    @ApiOperation(value = "xxx-xxx-op列表-op批量删除")
-    @RequestMapping(value = "delete_ids", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> deleteIdsAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(@RequestParam(value = "ids") long[] ids) {
-
-        log.info(JsonUtils.toJson(ids));
-
-        int ret = 0;
-
-        for (long id : ids) {
-            ret = accountingUnifiedSupplierOrderJdCheckUpReportXGoodsDubboConsumerService.deleteAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(id, getToken());
-        }
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "操作失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("操作成功");
-        }
-
-    }
-
-
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/controller/_thirdpart/jd/AccountingUnifiedSupplierOrderJdController.java

@@ -1,154 +0,0 @@
-package cn.superdesk.uniorder.controller._thirdpart.jd;
-
-import cn.superdesk.libs.common.json.JsonUtils;
-import cn.superdesk.uniorder.common.pagination.PageQueryParam;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.controller.base.BaseController;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJd;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdParam;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdQueryCriteria;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdListItemVo;
-import cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd.AccountingUnifiedSupplierOrderJdDubboConsumerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * @Description: 京东对账单中的订单 算是临时 sheet eg 深圳市侨城汇网络科技有限公司-2021年8月1日集采账单.xlsx
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-12 11:29:24
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-12 11:29:24
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Api(value = "供应商结算-京东对账-op导入详情", tags = {"供应商结算-京东对账-op导入详情"})
-@Slf4j
-@RestController
-@RequestMapping("/accountingUnifiedSupplierOrderJd")
-public class AccountingUnifiedSupplierOrderJdController extends BaseController {
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdDubboConsumerService accountingUnifiedSupplierOrderJdDubboConsumerService;
-
-    @ApiOperation(value = "分页查询-默认不用")
-    @RequestMapping(value = "listByObscure", method = RequestMethod.POST)
-    @ResponseBody
-    public R<List<AccountingUnifiedSupplierOrderJd>> pageQueryAccountingUnifiedSupplierOrderJd(@RequestBody PageQueryParam param) {
-
-        log.info("pageQueryAccountingUnifiedSupplierOrderJd:\n{}", JsonUtils.toJson(param));
-
-        R<List<AccountingUnifiedSupplierOrderJd>> result = new R<>();
-
-        // TODO 参数合法性判定
-
-        result = accountingUnifiedSupplierOrderJdDubboConsumerService.pageQuery(param.getConditions(), param.getPageNo(), param.getPageSize());
-
-        return result;
-    }
-
-    /**
-     * http://192.168.6.223:8089/web/accountingUnifiedSupplierOrderJd/list
-     *
-     * @param queryCriteria
-     * @return
-     */
-    @ApiOperation(value = "分页查询")
-    @RequestMapping(value = "list", method = RequestMethod.POST)
-    @ResponseBody
-    public R<List<AccountingUnifiedSupplierOrderJdListItemVo>> pageQueryGenericParamAccountingUnifiedSupplierOrderJd(
-            @RequestBody AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria) {
-
-        log.info("pageQueryAccountingUnifiedSupplierOrderJd:\n{}", JsonUtils.toJson(queryCriteria));
-
-        R<List<AccountingUnifiedSupplierOrderJdListItemVo>> result = new R<>();
-
-        // TODO 参数合法性判定
-
-        result = accountingUnifiedSupplierOrderJdDubboConsumerService.pageQueryGenericParam(queryCriteria, getToken());
-
-        return result;
-    }
-
-    @ApiOperation(value = "按id查询")
-    @RequestMapping(value = "{id}", method = RequestMethod.GET)
-    @ResponseBody
-    public R<List<AccountingUnifiedSupplierOrderJd>> getById(@PathVariable("id") long id) {
-
-        R<List<AccountingUnifiedSupplierOrderJd>> result = new R<>();
-
-        // TODO 参数合法性判定
-
-        AccountingUnifiedSupplierOrderJd entity = accountingUnifiedSupplierOrderJdDubboConsumerService.findAccountingUnifiedSupplierOrderJdById(id);
-
-        List<AccountingUnifiedSupplierOrderJd> data = new ArrayList<>();
-        data.add(entity);
-
-        result.setData(data);
-
-        return result;
-    }
-
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "add", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> addAccountingUnifiedSupplierOrderJd(@RequestBody AccountingUnifiedSupplierOrderJdParam param) {
-
-        log.info("addAccountingUnifiedSupplierOrderJd:\n{}", JsonUtils.toJson(param));
-
-
-        // TODO 参数合法性判定
-
-        accountingUnifiedSupplierOrderJdDubboConsumerService.addAccountingUnifiedSupplierOrderJd(param);
-
-        return new R<>("200", "操作成功", true);
-    }
-
-    @ApiOperation(value = "更新")
-    @RequestMapping(value = "update", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> updateAccountingUnifiedSupplierOrderJd(@RequestBody AccountingUnifiedSupplierOrderJdParam param) {
-
-        log.info("updateAccountingUnifiedSupplierOrderJd:\n{}", JsonUtils.toJson(param));
-
-        accountingUnifiedSupplierOrderJdDubboConsumerService.updateAccountingUnifiedSupplierOrderJd(param);
-
-        return new R<>("200", "操作成功", true);
-    }
-
-    @ApiOperation(value = "删除")
-    @RequestMapping(value = "delete/{id}", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> deleteAccountingUnifiedSupplierOrderJd(@PathVariable("id") long id) {
-
-        // TODO 参数合法性判定
-
-        accountingUnifiedSupplierOrderJdDubboConsumerService.deleteAccountingUnifiedSupplierOrderJd(id);
-
-        return new R<>("200", "操作成功", true);
-    }
-
-    @ApiOperation(value = "批量删除")
-    @RequestMapping(value = "delete_ids", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> deleteIdsAccountingUnifiedSupplierOrderJd(@RequestParam(value = "ids") long[] ids) {
-
-        log.info(JsonUtils.toJson(ids));
-
-        for (long id : ids) {
-            accountingUnifiedSupplierOrderJdDubboConsumerService.deleteAccountingUnifiedSupplierOrderJd(id);
-        }
-
-        return new R<>("200", "操作成功", true);
-
-    }
-
-
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/controller/_thirdpart/jd/AccountingUnifiedSupplierOrderJdExportExcelController.java

@@ -1,49 +0,0 @@
-package cn.superdesk.uniorder.controller._thirdpart.jd;
-
-import cn.hutool.json.JSONUtil;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.controller.base.BaseController;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdQueryCriteria;
-import cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd.AccountingUnifiedSupplierOrderJdDubboConsumerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @Description: Java类作用描述
- * @Author: linjinyu
- * @CreateDate: 2022/6/14 10:45 上午
- * @UpdateUser: linjinyu
- * @UpdateDate: 2022/6/14 10:45 上午
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Api(value = "供应商结算-京东对账-op导入详情", tags = {"供应商结算-京东对账-op导入详情"})
-@Slf4j
-@RestController
-@RequestMapping("/accountingUnifiedSupplierOrderJd/export")
-public class AccountingUnifiedSupplierOrderJdExportExcelController extends BaseController {
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdDubboConsumerService accountingUnifiedSupplierOrderJdDubboConsumerService;
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op下载导入文件")
-    @RequestMapping(value = "/excel/jdCheckUpReport/liteVersion", method = RequestMethod.POST)
-    public R<String> exportExcelJdImportRecord(
-            @RequestBody AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria) {
-
-        log.info("供应商结算-京东对账-op列表-op查看对账(对账详情)-op导出列表(精简版 Lite Version)-京东账单任务-某次导入数据-报告导出 params: \n{}", JSONUtil.toJsonStr(queryCriteria));
-
-        return new R<String>(accountingUnifiedSupplierOrderJdDubboConsumerService
-                .exportExcelJdImportRecord(
-                        queryCriteria,
-                        getToken()
-                )
-        );
-    }
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/controller/_thirdpart/jd/SysQuartzScheduleTaskStatementOfAccountJdController.java

@@ -1,544 +0,0 @@
-package cn.superdesk.uniorder.controller._thirdpart.jd;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.json.JSONUtil;
-import cn.superdesk.libs.common.json.JsonUtils;
-import cn.superdesk.uniorder.common.enums.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountIsPauseEnum;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.rest.response.ResponseResultOuterUtils;
-import cn.superdesk.uniorder.controller.base.BaseController;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJd;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.*;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.*;
-import cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService;
-import cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-/**
- * @Description: 定时任务-时刻任务-京东对账单
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-12 11:29:24
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-12 11:29:24
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Api(value = "供应商结算-京东对账", tags = {"供应商结算-京东对账"})
-@Slf4j
-@RestController
-@RequestMapping("/sysQuartzScheduleTaskStatementOfAccountJd")
-public class SysQuartzScheduleTaskStatementOfAccountJdController extends BaseController {
-
-    @Autowired
-    private SysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService;
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService;
-
-    /**
-     * http://192.168.6.223:8089/web/sysQuartzScheduleTaskStatementOfAccountJd/list
-     *
-     * @param queryCriteria
-     * @return
-     */
-    @ApiOperation(value = "供应商结算-京东对账-op列表")
-    @RequestMapping(value = "list", method = RequestMethod.POST)
-    @ResponseBody
-    public R<List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo>> pageQueryGenericParamSysQuartzScheduleTaskStatementOfAccountJd(
-            @RequestBody SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria) {
-
-        log.info("pageQuerySysQuartzScheduleTaskStatementOfAccountJd:\n{}", JsonUtils.toJson(queryCriteria));
-
-        R<List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo>> result = new R<>();
-
-        result = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.pageQueryGenericParam(queryCriteria, getToken());
-
-        return result;
-    }
-
-    @ApiOperation(value = "供应商结算-京东对账-op页头")
-    @RequestMapping(value = "head", method = RequestMethod.POST)
-    public R<SysQuartzScheduleTaskStatementOfAccountJdHeadVo> pageQueryHeadGenericParamSysQuartzScheduleTaskStatementOfAccountJd(
-            @RequestBody SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria) {
-
-        return ResponseResultOuterUtils.createSuccesResult("",
-                sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService
-                        .queryHeadGenericParam(
-                                queryCriteria,
-                                getToken()
-                        )
-        );
-    }
-
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op查看对账(对账详情)-带查询过滤")
-    @RequestMapping(value = "/opDetail", method = RequestMethod.POST)
-    public R<SysQuartzScheduleTaskStatementOfAccountJdDetailVo> opDetail(
-            @RequestBody SysQuartzScheduleTaskStatementOfAccountJdOpDetailForm form) {
-
-        log.info("供应商结算-京东对账-op列表-op查看对账 params : \n{}", JSONUtil.toJsonStr(form));
-
-
-        R<SysQuartzScheduleTaskStatementOfAccountJdDetailVo> response = new R<>();
-
-        if (ObjectUtil.isNull(form.getBatchId())) {
-            return ResponseResultOuterUtils.createErrorResult("500", "[参数异常]对账单号");
-        }
-
-        // TODO 参数合法性判定
-
-        /**************************************** head start ****************************************/
-
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultHead = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.queryGenericParam(
-                SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria
-                        .builder()
-
-                        .sysQuartzScheduleTaskStatementOfAccountJdId(form.getSysQuartzScheduleTaskStatementOfAccountJdId())
-
-                        .batchId(form.getBatchId())
-
-                        .build(),
-                getToken()
-        );
-
-        if (CollUtil.isEmpty(resultHead)) {
-            return ResponseResultOuterUtils.createErrorResult("500", "未查找到相关的信息");
-        }
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo head = resultHead.get(0);
-
-        /**************************************** head   end ****************************************/
-
-        /**************************************** statistics start ****************************************/
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportDetailStatisticsVo statistics = accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService.pageQueryHeadGenericParam(
-                AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria
-                        .builder()
-
-                        .batchId(form.getBatchId())
-
-                        // 要不要跟随条件呢? 先是跟随吧
-                        /**************************************** 供应商结算-京东对账-op列表-op查看对账(对账详情) 页内查询过滤 start ****************************************/
-                        .jdOrderSn(form.getJdOrderSn())
-                        .jdOriginalOrderSn(form.getJdOriginalOrderSn())
-                        .orderSn(form.getOrderSn())
-                        .processResult(form.getProcessResult())
-                        /**************************************** 供应商结算-京东对账-op列表-op查看对账(对账详情) 页内查询过滤 start ****************************************/
-
-                        .build(),
-                getToken()
-        );
-
-        statistics.setStatisticsAmountDimOrderDiff(
-                statistics.getStatisticsAmountDimOrderOutsider()
-                        .subtract(statistics.getStatisticsAmountDimOrderOwnsider())
-        );
-
-
-//        /**************************************** 修正 start ****************************************/
-//
-//        sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.updateByPrimaryKeySelective(
-//                SysQuartzScheduleTaskStatementOfAccountJd
-//                        .builder()
-//
-//                        .id(head.getId())
-//
-//                        .statisticsAmountDimOrderOutsider(statistics.getStatisticsAmountDimOrderOutsider())
-//                        .statisticsAmountDimOrderOwnsider(statistics.getStatisticsAmountDimOrderOwnsider())
-//
-//                        .build()
-//        );
-//
-//        /**************************************** 修正 start ****************************************/
-
-
-        /**************************************** statistics   end ****************************************/
-
-        /**************************************** list start ****************************************/
-
-        R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo>> resultList = accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService
-                .pageQueryGenericParam(
-                        AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria
-                                .builder()
-
-                                .batchId(form.getBatchId())
-
-                                /**************************************** 供应商结算-京东对账-op列表-op查看对账(对账详情) 页内查询过滤 start ****************************************/
-                                .jdOrderSn(form.getJdOrderSn())
-                                .jdOriginalOrderSn(form.getJdOriginalOrderSn())
-                                .orderSn(form.getOrderSn())
-                                .processResult(form.getProcessResult())
-                                /**************************************** 供应商结算-京东对账-op列表-op查看对账(对账详情) 页内查询过滤 start ****************************************/
-
-                                .pageNumber(form.getPageNumber())
-                                .pageSize(form.getPageSize())
-
-                                .build(),
-                        getToken()
-                );
-
-        /**************************************** list   end ****************************************/
-
-
-        response.setCode("200");
-        response.setSuccess(true);
-        response.setData(SysQuartzScheduleTaskStatementOfAccountJdDetailVo
-                .builder()
-                .head(head)
-                .statistics(statistics)
-                .list(resultList.getData())
-                .build());
-        response.setCount(resultList.getCount());
-        response.setCurrentPage(resultList.getCurrentPage());
-        response.setPageSize(resultList.getPageSize());
-
-        return response;
-    }
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op查看对账(对账详情)-带查询过滤-带狗")
-    @RequestMapping(value = "/opDetail/woof", method = RequestMethod.POST)
-    public R<SysQuartzScheduleTaskStatementOfAccountJdDetailVoWoof> opDetailWoof(
-            @RequestBody SysQuartzScheduleTaskStatementOfAccountJdOpDetailForm form) {
-
-        log.info("供应商结算-京东对账-op列表-op查看对账 params : \n{}", JSONUtil.toJsonStr(form));
-
-
-        R<SysQuartzScheduleTaskStatementOfAccountJdDetailVoWoof> response = new R<>();
-
-        if (ObjectUtil.isNull(form.getBatchId())) {
-            return ResponseResultOuterUtils.createErrorResult("500", "[参数异常]对账单号");
-        }
-
-        // TODO 参数合法性判定
-
-        /**************************************** head start ****************************************/
-
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultHead = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService
-                .queryGenericParam(
-                        SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria
-                                .builder()
-
-                                .sysQuartzScheduleTaskStatementOfAccountJdId(form.getSysQuartzScheduleTaskStatementOfAccountJdId())
-
-                                .batchId(form.getBatchId())
-
-                                .build(),
-                        getToken()
-                );
-
-        if (CollUtil.isEmpty(resultHead)) {
-            return ResponseResultOuterUtils.createErrorResult("500", "未查找到相关的信息");
-        }
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo head = resultHead.get(0);
-
-        /**************************************** head   end ****************************************/
-
-        /**************************************** statistics start ****************************************/
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportDetailStatisticsVo statistics = accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService
-                .pageQueryHeadGenericParam(
-                        AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria
-                                .builder()
-
-                                .batchId(form.getBatchId())
-
-                                // 要不要跟随条件呢? 先是跟随吧
-                                /**************************************** 供应商结算-京东对账-op列表-op查看对账(对账详情) 页内查询过滤 start ****************************************/
-                                .jdOrderSn(form.getJdOrderSn())
-                                .jdOriginalOrderSn(form.getJdOriginalOrderSn())
-                                .orderSn(form.getOrderSn())
-                                .processResult(form.getProcessResult())
-                                /**************************************** 供应商结算-京东对账-op列表-op查看对账(对账详情) 页内查询过滤 start ****************************************/
-
-                                .build(),
-                        getToken()
-                );
-
-        statistics.setStatisticsAmountDimOrderDiff(
-                statistics.getStatisticsAmountDimOrderOutsider()
-                        .subtract(statistics.getStatisticsAmountDimOrderOwnsider())
-        );
-
-
-//        /**************************************** 修正 start ****************************************/
-//
-//        sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.updateByPrimaryKeySelective(
-//                SysQuartzScheduleTaskStatementOfAccountJd
-//                        .builder()
-//
-//                        .id(head.getId())
-//
-//                        .statisticsAmountDimOrderOutsider(statistics.getStatisticsAmountDimOrderOutsider())
-//                        .statisticsAmountDimOrderOwnsider(statistics.getStatisticsAmountDimOrderOwnsider())
-//
-//                        .build()
-//        );
-//
-//        /**************************************** 修正 start ****************************************/
-
-
-        /**************************************** statistics   end ****************************************/
-
-        /**************************************** list start ****************************************/
-
-        R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof>> resultList = accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService
-                .pageQueryGenericWoof(
-                        AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria
-                                .builder()
-
-                                .batchId(form.getBatchId())
-
-                                /**************************************** 供应商结算-京东对账-op列表-op查看对账(对账详情) 页内查询过滤 start ****************************************/
-                                .jdOrderSn(form.getJdOrderSn())
-                                .jdOriginalOrderSn(form.getJdOriginalOrderSn())
-                                .orderSn(form.getOrderSn())
-                                .processResult(form.getProcessResult())
-                                /**************************************** 供应商结算-京东对账-op列表-op查看对账(对账详情) 页内查询过滤 start ****************************************/
-
-                                .pageNumber(form.getPageNumber())
-                                .pageSize(form.getPageSize())
-
-                                .build(),
-                        getToken()
-                );
-
-        /**************************************** list   end ****************************************/
-
-
-        response.setCode("200");
-        response.setSuccess(true);
-        response.setData(SysQuartzScheduleTaskStatementOfAccountJdDetailVoWoof
-                .builder()
-                .head(head)
-                .statistics(statistics)
-                .list(resultList.getData())
-                .build());
-        response.setCount(resultList.getCount());
-        response.setCurrentPage(resultList.getCurrentPage());
-        response.setPageSize(resultList.getPageSize());
-
-        return response;
-    }
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op修正统计")
-    @RequestMapping(value = "/opFixStatistics", method = RequestMethod.POST)
-    public R<String> opFixStatistics(
-            @RequestBody SysQuartzScheduleTaskStatementOfAccountJdOpDetailForm form) {
-
-        log.info("供应商结算-京东对账-op列表-op查看对账 params : \n{}", JSONUtil.toJsonStr(form));
-
-
-        R<SysQuartzScheduleTaskStatementOfAccountJdDetailVo> response = new R<>();
-
-        if (ObjectUtil.isNull(form.getBatchId())) {
-            return ResponseResultOuterUtils.createErrorResult("500", "[参数异常]对账单号");
-        }
-
-        // TODO 参数合法性判定
-
-        /**************************************** head start ****************************************/
-
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultHead = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.queryGenericParam(
-                SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria
-                        .builder()
-
-                        .sysQuartzScheduleTaskStatementOfAccountJdId(form.getSysQuartzScheduleTaskStatementOfAccountJdId())
-
-                        .batchId(form.getBatchId())
-
-                        .build(),
-                getToken()
-        );
-
-        if (CollUtil.isEmpty(resultHead)) {
-            return ResponseResultOuterUtils.createErrorResult("500", "未查找到相关的信息");
-        }
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo head = resultHead.get(0);
-
-        /**************************************** head   end ****************************************/
-
-        /**************************************** statistics start ****************************************/
-
-        AccountingUnifiedSupplierOrderJdCheckUpReportDetailStatisticsVo statistics = accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService.pageQueryHeadGenericParam(
-                AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria
-                        .builder()
-
-                        .batchId(form.getBatchId())
-
-                        .build(),
-                getToken()
-        );
-
-        statistics.setStatisticsAmountDimOrderDiff(
-                statistics.getStatisticsAmountDimOrderOutsider()
-                        .subtract(statistics.getStatisticsAmountDimOrderOwnsider())
-        );
-
-
-        /**************************************** 修正 start ****************************************/
-
-        sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.updateByPrimaryKeySelective(
-                SysQuartzScheduleTaskStatementOfAccountJd
-                        .builder()
-
-                        .id(head.getId())
-
-                        .statisticsAmountDimOrderOutsider(statistics.getStatisticsAmountDimOrderOutsider())
-                        .statisticsAmountDimOrderOwnsider(statistics.getStatisticsAmountDimOrderOwnsider())
-
-                        .build()
-        );
-
-        /**************************************** 修正 start ****************************************/
-
-
-        /**************************************** statistics   end ****************************************/
-
-
-        return ResponseResultOuterUtils.createSuccesResult();
-    }
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op备注")
-    @RequestMapping(value = "/opSetRemark", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> opSetRemark(@RequestBody SysQuartzScheduleTaskStatementOfAccountJdOpSetRemarkForm form) {
-
-        log.info("供应商结算-京东对账-op列表-op备注 params : \n{}", JSONUtil.toJsonStr(form));
-
-        int ret = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.opSetRemark(form, getToken());
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("成功");
-        }
-    }
-
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op设置导入任务为-自动模式")
-    @RequestMapping(value = "/opSetImportTask/automatic", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> opSetImportTaskAutomatic(@RequestBody SysQuartzScheduleTaskStatementOfAccountJdOpSetIsPauseForm form) {
-
-        form.setIsPauseEnum(SysQuartzScheduleTaskStatementOfAccountIsPauseEnum.启用);
-
-        log.info("供应商结算-京东对账-op列表-op设置导入任务为自动模式 params : \n{}", JSONUtil.toJsonStr(form));
-
-        int ret = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.opSetIsPause(form, getToken());
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("成功");
-        }
-    }
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op设置导入任务为-手动模式")
-    @RequestMapping(value = "/opSetImportTask/manual", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> opSetImportTaskManual(@RequestBody SysQuartzScheduleTaskStatementOfAccountJdOpSetIsPauseForm form) {
-
-        form.setIsPauseEnum(SysQuartzScheduleTaskStatementOfAccountIsPauseEnum.暂停);
-
-        log.info("供应商结算-京东对账-op列表-op设置导入任务为手动模式 params : \n{}", JSONUtil.toJsonStr(form));
-
-        int ret = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.opSetIsPause(form, getToken());
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("成功");
-        }
-    }
-
-
-    @Deprecated
-    @ApiOperation(value = "按id查询")
-    @RequestMapping(value = "{id}", method = RequestMethod.GET)
-    @ResponseBody
-    public R<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> getById(@PathVariable("id") long id) {
-
-        // TODO 参数合法性判定
-
-        return ResponseResultOuterUtils.createSuccesResult("",
-                sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService
-                        .findListItemVoById(
-                                id,
-                                getToken()
-                        )
-        );
-
-    }
-
-    @Deprecated
-    @ApiOperation(value = "新增")
-    @RequestMapping(value = "add", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> addSysQuartzScheduleTaskStatementOfAccountJd(@RequestBody SysQuartzScheduleTaskStatementOfAccountJdParam param) {
-
-        log.info("addSysQuartzScheduleTaskStatementOfAccountJd:\n{}", JsonUtils.toJson(param));
-
-        // TODO 参数合法性判定
-
-        int ret = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.addSysQuartzScheduleTaskStatementOfAccountJd(param, getToken());
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "操作失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("操作成功");
-        }
-    }
-
-    @Deprecated
-    @ApiOperation(value = "更新")
-    @RequestMapping(value = "update", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> updateSysQuartzScheduleTaskStatementOfAccountJd(@RequestBody SysQuartzScheduleTaskStatementOfAccountJdParam param) {
-
-        log.info("updateSysQuartzScheduleTaskStatementOfAccountJd:\n{}", JsonUtils.toJson(param));
-
-        int ret = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.updateSysQuartzScheduleTaskStatementOfAccountJd(param, getToken());
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "操作失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("操作成功");
-        }
-    }
-
-
-    @Deprecated
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op批量删除任务")
-    @RequestMapping(value = "delete_ids", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> deleteIdsSysQuartzScheduleTaskStatementOfAccountJd(@RequestParam(value = "ids") long[] ids) {
-
-        log.info(JsonUtils.toJson(ids));
-
-        int ret = 0;
-
-        for (long id : ids) {
-            ret = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.deleteSysQuartzScheduleTaskStatementOfAccountJd(id, getToken());
-        }
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "操作失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("操作成功");
-        }
-
-    }
-
-
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/controller/_thirdpart/jd/SysQuartzScheduleTaskStatementOfAccountJdExOpPartController.java

@@ -1,437 +0,0 @@
-package cn.superdesk.uniorder.controller._thirdpart.jd;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import cn.superdesk.uniorder.common.enums.accounting.supplier.AccountingOrderSupplierAccountingStatusEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskAccountingStatusEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskCheckStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskProcessStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskRunStatusEnum;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.rest.response.ResponseResultOuterUtils;
-import cn.superdesk.uniorder.controller.base.BaseController;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpCancelForm;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpConfirmForm;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpDeleteForm;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdListItemVo;
-import cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService;
-import cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdExOpPartDubboConsumerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-/**
- * @Description: 供应商结算-京东对账-op列表-操作部分
- * mark by linjinyu at 2022-06-167 11:54:53 - 目前这些操作 可以想象为外壳
- * 供应商结算-京东对账-op列表-op删除任务{@link #opDelete(SysQuartzScheduleTaskStatementOfAccountJdOpDeleteForm)} -> 京东对账层面逻辑 ~ 清理销定 ~ 删除(子数据(导入数据)子数据(比对数据)面数据(京东对账任务本身))
- * 供应商结算-京东对账-op列表-op确认账单{@link #opConfirm(SysQuartzScheduleTaskStatementOfAccountJdOpConfirmForm)} -> 京东对账层面逻辑 -> 供应商结算-op创建对账单 -> 京东对账层面逻辑
- * 供应商结算-京东对账-op列表-op取消账单{@link #opCancel(SysQuartzScheduleTaskStatementOfAccountJdOpCancelForm)} -> 京东对账层面逻辑 ~
- * @Author: linjinyu
- * @CreateDate: 10/12/20 4:28 PM
- * @UpdateUser: linjinyu
- * @UpdateDate: 10/12/20 4:28 PM
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Api(value = "供应商结算-京东对账-op列表-操作部分", tags = {"供应商结算-京东对账-op列表-操作部分"})
-@Slf4j
-@RestController
-@RequestMapping("/sysQuartzScheduleTaskStatementOfAccountJd/opPart")
-public class SysQuartzScheduleTaskStatementOfAccountJdExOpPartController extends BaseController {
-
-    @Autowired
-    private SysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService         sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService;
-    @Autowired
-    private SysQuartzScheduleTaskStatementOfAccountJdExOpPartDubboConsumerService sysQuartzScheduleTaskStatementOfAccountJdExOpPartDubboConsumerService;
-
-
-    /**************************************** 供应商结算-京东对账-op列表-操作部分 start ****************************************/
-
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op删除任务")
-    @RequestMapping(value = "opDelete", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> opDelete(@RequestBody SysQuartzScheduleTaskStatementOfAccountJdOpDeleteForm form) {
-
-
-        // TODO 参数合法性判定
-
-        // 该对账任务存在，若不存在，1.5s提示`该对账任务不存在，请返回检查`； ----
-
-        /**************************************** 逻辑判定1 start ****************************************/
-
-
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultList = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService
-                .queryGenericParam(
-                        SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria
-                                .builder()
-
-                                .sysQuartzScheduleTaskStatementOfAccountJdId(form.getSysQuartzScheduleTaskStatementOfAccountJdId())
-
-                                .build(),
-                        getToken()
-                );
-
-        if (CollUtil.isEmpty(resultList)) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务不存在，请返回检查");
-        }
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo head = resultList.get(0);
-
-        form.setBatchId(head.getBatchId());
-
-        log.info("供应商结算-京东对账-op列表-op删除任务 opDelete\n{}\n{}\n运行步骤 -> {}\n导入状态 -> {}\n对账状态 -> {}\n对账结果 -> {}",
-                JSONUtil.toJsonStr(form),
-                JSONUtil.toJsonStr(head),
-                ScheduleTaskRunStatusEnum.getDesc(head.getRunState()),
-                ScheduleTaskProcessStateEnum.getDesc(head.getProcessState()),
-                ScheduleTaskAccountingStatusEnum.getDesc(head.getAccountingStatus()),
-                ScheduleTaskCheckStateEnum.getDesc(head.getCheckState())
-        );
-
-        /**************************************** 逻辑判定1   end ****************************************/
-
-        /**************************************** 逻辑判定-插入-运行中判定 start ****************************************/
-
-        Integer[] scheduleTaskRunStatusEnumContains = {
-                ScheduleTaskRunStatusEnum.导入中.getKey(), // ---- 时间较长
-                ScheduleTaskRunStatusEnum.对账中.getKey(), // ---- 时间很长++++ 按业务需求推，光从订单角度是不行的，得细到商品
-                ScheduleTaskRunStatusEnum.确认中.getKey()  // ---- 时间较短
-        };
-        if (ArrayUtil.contains(
-                scheduleTaskRunStatusEnumContains,
-                head.getRunState())
-        ) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务正在执行中，请稍后再试");
-        }
-
-        /**************************************** 逻辑判定-插入-运行中判定   end ****************************************/
-
-        // 该对账任务的导入状态为`导入失败`或对账结果为`异常`或对账单状态为`已取消`时，满足其中一个即允许确认删除，否则1.5s提示`只允许删除`导入失败/异常/已取消的对账任务`，请返回检查`；
-        // 该对账任务的
-        // 导入状态为`导入失败`或
-        // 对账结果为`异常`或
-        // 对账状态为`已取消`时，满足其中一个即允许确认删除，否则1.5s提示`只允许删除`导入失败/异常/已取消的对账任务`，请返回检查`；
-
-        /**************************************** 逻辑判定2 start ****************************************/
-
-        int countCheckPoint = 0;
-
-        // 导入状态 start ****************************************
-        Integer[] scheduleTaskProcessStateEnumContains = {
-                ScheduleTaskProcessStateEnum.导入失败.getKey(),
-        };
-        if (ArrayUtil.contains(
-                scheduleTaskProcessStateEnumContains,
-                head.getProcessState())
-        ) {
-            log.info("导入状态 | 导入失败 ++ ");
-            countCheckPoint++;
-        }
-        // 导入状态   end ****************************************
-
-        // 对账状态 start ****************************************
-        Integer[] scheduleTaskAccountingStatusEnumContains = {
-                ScheduleTaskAccountingStatusEnum.已取消.getKey(),
-        };
-        if (ArrayUtil.contains(
-                scheduleTaskAccountingStatusEnumContains,
-                head.getAccountingStatus())
-        ) {
-            log.info("对账状态 | 已取消;对账失败; ++ ");
-            countCheckPoint++;
-        }
-        // 对账状态   end ****************************************
-
-        // 对账结果 start ****************************************
-        Integer[] scheduleTaskCheckStateEnumContains = {
-                ScheduleTaskCheckStateEnum.待对账.getKey(),
-                ScheduleTaskCheckStateEnum.异常.getKey()
-        };
-        if (ArrayUtil.contains(
-                scheduleTaskCheckStateEnumContains,
-                head.getCheckState())
-        ) {
-            log.info("对账结果 | 异常 ++ ");
-            countCheckPoint++;
-        }
-        // 对账结果   end ****************************************
-
-        // 对账单状态 start ****************************************
-        Integer[] accountingOrderSupplierAccountingStatusEnumContains = {
-                AccountingOrderSupplierAccountingStatusEnum.已取消.getKey(),
-        };
-        if (ArrayUtil.contains(
-                accountingOrderSupplierAccountingStatusEnumContains,
-                head.getAusuAccountingStatus())
-        ) {
-            countCheckPoint++;
-        }
-        // 对账单状态   end ****************************************
-
-        if (countCheckPoint == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "只允许删除`导入失败/已取消/异常`的对账任务，请返回检查");
-        }
-
-        /**************************************** 逻辑判定2   end ****************************************/
-
-
-        int ret = sysQuartzScheduleTaskStatementOfAccountJdExOpPartDubboConsumerService.opDelete(form, getToken());
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "删除任务失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("删除任务成功");
-        }
-
-    }
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op确认账单")
-    @RequestMapping(value = "/opConfirm", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> opConfirm(@RequestBody SysQuartzScheduleTaskStatementOfAccountJdOpConfirmForm form) {
-
-        // TODO 参数合法性判定
-
-        // 该对账任务存在，若不存在，1.5s提示`该对账任务不存在，请返回检查`； ----
-
-        /**************************************** 逻辑判定1 start ****************************************/
-
-
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultList = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService
-                .queryGenericParam(
-                        SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria
-                                .builder()
-
-                                .sysQuartzScheduleTaskStatementOfAccountJdId(form.getSysQuartzScheduleTaskStatementOfAccountJdId())
-
-                                .build(),
-                        getToken()
-                );
-
-        if (CollUtil.isEmpty(resultList)) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务不存在，请返回检查");
-        }
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo head = resultList.get(0);
-
-        form.setBatchId(head.getBatchId());
-
-        log.info("供应商结算-京东对账-op列表-op删除任务 opDelete\n{}\n{}\n运行步骤 -> {}\n导入状态 -> {}\n对账状态 -> {}\n对账结果 -> {}",
-                JSONUtil.toJsonStr(form),
-                JSONUtil.toJsonStr(head),
-                ScheduleTaskRunStatusEnum.getDesc(head.getRunState()),
-                ScheduleTaskProcessStateEnum.getDesc(head.getProcessState()),
-                ScheduleTaskAccountingStatusEnum.getDesc(head.getAccountingStatus()),
-                ScheduleTaskCheckStateEnum.getDesc(head.getCheckState())
-        );
-
-        /**************************************** 逻辑判定1   end ****************************************/
-
-        /**************************************** 逻辑判定-插入-运行中判定 start ****************************************/
-
-        Integer[] scheduleTaskRunStatusEnumContains = {
-                ScheduleTaskRunStatusEnum.导入中.getKey(), // ---- 时间较长
-                ScheduleTaskRunStatusEnum.对账中.getKey(), // ---- 时间很长++++ 按业务需求推，光从订单角度是不行的，得细到商品
-                ScheduleTaskRunStatusEnum.确认中.getKey(), // ---- 时间较短
-        };
-        if (ArrayUtil.contains(
-                scheduleTaskRunStatusEnumContains,
-                head.getRunState())
-        ) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务正在执行中，请稍后再试");
-        }
-
-        /**************************************** 逻辑判定-插入-运行中判定   end ****************************************/
-
-
-        /**************************************** 逻辑判定2 start ****************************************/
-
-        // 该对账任务的对账状态为`对账完成`，若非`对账完成`，1.5s提示`该对账任务未对账完成，请返回检查`；
-        // 对账状态 start ****************************************
-        Integer[] scheduleTaskAccountingStatusEnumContains = {
-                ScheduleTaskAccountingStatusEnum.对账完成.getKey(),
-        };
-        if (!ArrayUtil.contains(
-                scheduleTaskAccountingStatusEnumContains,
-                head.getAccountingStatus())
-        ) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务未对账完成，请返回检查");
-        }
-        // 对账状态   end ****************************************
-
-        // 该对账任务的对账结果为`正常`，若非`正常`，1.5s提示`该对账任务对账结果非正常，请返回检查`；
-        // 对账结果 start ****************************************
-        Integer[] scheduleTaskCheckStateEnumContains = {
-                ScheduleTaskCheckStateEnum.正常.getKey(),
-        };
-        if (!ArrayUtil.contains(
-                scheduleTaskCheckStateEnumContains,
-                head.getCheckState())
-        ) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务对账结果非正常，请返回检查");
-        }
-        // 对账结果   end ****************************************
-
-        // 该对账任务的对账单状态为`未确认`，若非`未确认`，1.5s提示`该对账任务已创建对账单，请返回检查`；
-        // 对账单状态 start ****************************************
-        Integer[] accountingOrderSupplierAccountingStatusEnumContains = {
-                AccountingOrderSupplierAccountingStatusEnum.未确认.getKey(),
-        };
-        if (!ArrayUtil.contains(
-                accountingOrderSupplierAccountingStatusEnumContains,
-                head.getAusuAccountingStatus())
-        ) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务已创建对账单，请返回检查");
-        }
-        // 对账单状态   end ****************************************
-
-        // 该对账任务的结算中心账单编号为空，若非空，1.5s提示`该对账任务已创建对账单，请返回检查`；
-        if (StrUtil.isNotBlank(head.getAccountingOrderSn())) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务已创建对账单，请返回检查");
-        }
-
-
-        /**************************************** 逻辑判定2   end ****************************************/
-
-
-        int ret = sysQuartzScheduleTaskStatementOfAccountJdExOpPartDubboConsumerService.opConfirm(form, getToken());
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "确认账单失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("确认账单成功");
-        }
-
-    }
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op取消账单")
-    @RequestMapping(value = "/opCancel", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> opCancel(@RequestBody SysQuartzScheduleTaskStatementOfAccountJdOpCancelForm form) {
-
-        // TODO 参数合法性判定
-
-        // 该对账任务存在，若不存在，1.5s提示`该对账任务不存在，请返回检查`； ----
-
-        /**************************************** 逻辑判定1 start ****************************************/
-
-        List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultList = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService
-                .queryGenericParam(
-                        SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria
-                                .builder()
-
-                                .sysQuartzScheduleTaskStatementOfAccountJdId(form.getSysQuartzScheduleTaskStatementOfAccountJdId())
-
-                                .build(),
-                        getToken()
-                );
-
-        if (CollUtil.isEmpty(resultList)) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务不存在，请返回检查");
-        }
-
-        SysQuartzScheduleTaskStatementOfAccountJdListItemVo head = resultList.get(0);
-
-        form.setBatchId(head.getBatchId());
-        log.info("供应商结算-京东对账-op列表-op删除任务 opDelete\n{}\n{}\n运行步骤 -> {}\n导入状态 -> {}\n对账状态 -> {}\n对账结果 -> {}",
-                JSONUtil.toJsonStr(form),
-                JSONUtil.toJsonStr(head),
-                ScheduleTaskRunStatusEnum.getDesc(head.getRunState()),
-                ScheduleTaskProcessStateEnum.getDesc(head.getProcessState()),
-                ScheduleTaskAccountingStatusEnum.getDesc(head.getAccountingStatus()),
-                ScheduleTaskCheckStateEnum.getDesc(head.getCheckState())
-        );
-
-        /**************************************** 逻辑判定1   end ****************************************/
-
-        /**************************************** 逻辑判定-插入-运行中判定 start ****************************************/
-
-        Integer[] scheduleTaskRunStatusEnumContains = {
-                ScheduleTaskRunStatusEnum.导入中.getKey(), // ---- 时间较长
-                ScheduleTaskRunStatusEnum.对账中.getKey(), // ---- 时间很长++++ 按业务需求推，光从订单角度是不行的，得细到商品
-                ScheduleTaskRunStatusEnum.确认中.getKey(), // ---- 时间较短
-        };
-        if (ArrayUtil.contains(
-                scheduleTaskRunStatusEnumContains,
-                head.getRunState())
-        ) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务正在执行中，请稍后再试");
-        }
-
-        /**************************************** 逻辑判定-插入-运行中判定   end ****************************************/
-
-
-        /**************************************** 逻辑判定2 start ****************************************/
-
-        // 该对账任务的对账状态为`对账完成`，若非`对账完成`，1.5s提示`该对账任务未对账完成，请返回检查`；
-        // 对账结果 start ****************************************
-        Integer[] scheduleTaskAccountingStatusEnumContains = {
-                ScheduleTaskAccountingStatusEnum.对账完成.getKey(),
-        };
-        if (!ArrayUtil.contains(
-                scheduleTaskAccountingStatusEnumContains,
-                head.getAccountingStatus())
-        ) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务未对账完成，请返回检查");
-        }
-        // 对账结果   end ****************************************
-
-        // 该对账任务的对账结果为`正常`，若非`正常`，1.5s提示`该对账任务对账结果非正常，请返回检查`；
-        // 对账结果 start ****************************************
-        Integer[] scheduleTaskCheckStateEnumContains = {
-                ScheduleTaskCheckStateEnum.正常.getKey(),
-        };
-        if (!ArrayUtil.contains(
-                scheduleTaskCheckStateEnumContains,
-                head.getCheckState())
-        ) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务对账结果非正常，请返回检查");
-        }
-        // 对账结果   end ****************************************
-
-
-        // 该对账任务的结算中心账单编号为空，若非空，1.5s提示`该对账任务已创建对账单，请返回检查`；
-        if (StrUtil.isNotBlank(head.getAccountingOrderSn())) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务已创建对账单，请返回检查");
-        }
-
-        // 该对账任务的对账单状态为`未确认`，若非`未确认`，1.5s提示`该对账任务已创建对账单，请返回检查`；
-        // 对账单状态 start ****************************************
-        Integer[] accountingOrderSupplierAccountingStatusEnumContains = {
-                AccountingOrderSupplierAccountingStatusEnum.未确认.getKey(),
-                AccountingOrderSupplierAccountingStatusEnum.已取消.getKey(),
-        };
-        if (!ArrayUtil.contains(
-                accountingOrderSupplierAccountingStatusEnumContains,
-                head.getAusuAccountingStatus())
-        ) {
-            return ResponseResultOuterUtils.createErrorResult("500", "该对账任务未对账完成，请返回检查");
-        }
-        // 对账单状态   end ****************************************
-
-
-        /**************************************** 逻辑判定2   end ****************************************/
-
-
-        int ret = sysQuartzScheduleTaskStatementOfAccountJdExOpPartDubboConsumerService.opCancel(form, getToken());
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "取消账单失败");
-        } else {
-            return ResponseResultOuterUtils.createSuccesResult("取消账单成功");
-        }
-    }
-
-    /**************************************** 供应商结算-京东对账-op列表-操作部分   end ****************************************/
-
-
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/controller/_thirdpart/jd/ThirdPartJdReconciliationScheduleController.java

@@ -1,377 +0,0 @@
-package cn.superdesk.uniorder.controller._thirdpart.jd;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.lang.Snowflake;
-import cn.hutool.core.lang.UUID;
-import cn.superdesk.uniorder.common.enums.accounting.AccountingOrderDimCreateByEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskAccountingStatusEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskCheckStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskProcessStateEnum;
-import cn.superdesk.uniorder.common.enums.scheduler.jd.ScheduleTaskRunStatusEnum;
-import cn.superdesk.uniorder.common.enums.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountIsPauseEnum;
-import cn.superdesk.uniorder.common.exception.UnifiedOrderRuntimeException;
-import cn.superdesk.uniorder.common.exception.constants.ExceptionMsg;
-import cn.superdesk.uniorder.common.json.AnJsonUtils;
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.rest.response.ResponseResultOuterUtils;
-import cn.superdesk.uniorder.controller.base.BaseController;
-import cn.superdesk.uniorder.dto._constant.ResourceConstant;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdParam;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportSnapshotStruct;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdListItemVo;
-import cn.superdesk.uniorder.dubbo.consumer._common.ProviderEnvConstantDubboCustomerService;
-import cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService;
-import cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.annotation.Resource;
-import java.io.File;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-
-
-/**
- * @Description: 第三方-szhtxx-深圳航天信息有限公司-e6软件
- * @Author: linjinyu
- * @CreateDate: 2021/3/17 上午9:45
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021/3/17 上午9:45
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Api(value = "供应商结算-京东对账-步骤", tags = {"供应商结算-京东对账-步骤"})
-@Slf4j
-@RestController
-@RequestMapping("/thirdpart/jd/reconciliation_schedule/")
-public class ThirdPartJdReconciliationScheduleController extends BaseController {
-
-    @Autowired
-    private SysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService;
-
-    @Autowired
-    private AccountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService;
-
-    @Resource
-    private ProviderEnvConstantDubboCustomerService providerEnvConstantDubboCustomerService;
-
-    @Resource
-    private Snowflake snowflake;
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-(能否导入)op导入账单(上传excel与表单)-检查队列是否有任务")
-    @RequestMapping(value = "checkIn/task", method = RequestMethod.POST)
-    @ResponseBody
-    public R<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> checkIn() {
-        return ResponseResultOuterUtils.createSuccesResult(
-                "检查队列是否有任务-data为``代表没有",
-                sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService
-                        .deQueueOneImportExcel(
-                                getToken()
-                        )
-        );
-    }
-
-    /**
-     * http://192.168.6.223:8089/web/thirdpart/jd/reconciliation_schedule/store/excel/and/create/task
-     *
-     * @param multipartFile
-     * @return
-     * @throws Exception
-     */
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op导入账单(上传excel与表单)")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "statementOfAccountType", value = "账单类型:京东 对账单类型 1-客户结算;2-供应商结算;21-供应商结算-京东; 所以传21", paramType = "form", required = true, dataType = "Integer"),
-
-            @ApiImplicitParam(name = "saleId", value = "供应商Id(外部)", paramType = "form", required = true, dataType = "Long"),
-
-            @ApiImplicitParam(name = "excelFile", value = "导入账单", paramType = "form", required = true, dataType = "MultipartFile"),
-
-            @ApiImplicitParam(name = "cycleBeginTime", value = "账单周期 日期范围 开始日期 eg 2021-10-01", paramType = "form", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "cycleEndTime", value = "账单周期 日期范围 开始日期 eg 2021-10-31", paramType = "form", required = true, dataType = "String"),
-
-            @ApiImplicitParam(name = "thirdPartAccountingOrderSn", value = "账单编号(第三方)", paramType = "form", required = true, dataType = "String"),
-            @ApiImplicitParam(name = "remark", value = "备注", paramType = "form", required = false, dataType = "String")
-    })
-    @RequestMapping(value = "store/excel/and/create/task", method = RequestMethod.POST)
-    @ResponseBody
-    public R<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> excelImportAndStore(
-            @RequestParam(value = "statementOfAccountType") Integer statementOfAccountType,
-
-            @RequestParam(value = "saleId") Long saleId,
-
-            @RequestParam(value = "excelFile") MultipartFile multipartFile,
-
-            @RequestParam(value = "cycleBeginTime") String cycleBeginTimeStr,
-            @RequestParam(value = "cycleEndTime") String cycleEndTimeStr,
-
-            @RequestParam(value = "thirdPartAccountingOrderSn") String thirdPartAccountingOrderSn,
-            @RequestParam(value = "remark") String remark,
-
-            @RequestParam(value = "dateFormat", defaultValue = "yyyy-MM-dd HH:mm:ss") String dateFormat
-    ) throws Exception {
-//		yyyy-MM-dd
-//		yyyy-MM-dd HH:mm:ss
-//		2021-08-01 00:00:00
-//		2021-08-31 23:59:59
-        Date cycleBeginTime = DateUtil.parse(cycleBeginTimeStr + " " + "00:00:00", dateFormat);
-        Date cycleEndTime   = DateUtil.parse(cycleEndTimeStr + " " + "23:59:59", dateFormat);
-
-//		cycleEndTime = DateUtil.endOfDay(cycleEndTime);
-
-        log.info("\n{}\n{}\n{}\n{}", cycleBeginTimeStr, cycleEndTimeStr, cycleBeginTime, cycleEndTime);
-
-
-        ResourceConstant excelExportConstant = providerEnvConstantDubboCustomerService.getResourceConstant();
-
-        String excelExportPathRoot             = excelExportConstant.getPathRoot();
-        String excelExportRelativePathTemplate = excelExportConstant.getPathTemplate();
-        String excelExportRelativePathStorage  = excelExportConstant.getPathStorage();
-
-        String relativePath = File.separator + "upload" +
-                File.separator + "thirdpart" +
-                File.separator + "jd" +
-                File.separator + "import" +
-                File.separator + "reconciliation_schedule" +
-                File.separator;
-
-        String currentDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-
-        String targetFullPath = excelExportPathRoot + relativePath + currentDate + File.separator;
-
-        if (!FileUtil.exist(targetFullPath)) {
-            FileUtil.mkdir(targetFullPath);
-        }
-
-        String originalFilename = multipartFile.getOriginalFilename();
-        String fileName         = UUID.randomUUID().toString() + "@" + multipartFile.getOriginalFilename();
-        String suffix           = Objects.requireNonNull(multipartFile.getOriginalFilename()).substring(multipartFile.getOriginalFilename().lastIndexOf(".") + 1);
-
-        String targetRelativePathAndFileName = relativePath + currentDate + File.separator + fileName;
-
-        File file1 = FileUtil.writeBytes(multipartFile.getBytes(), targetFullPath + fileName);
-
-        log.info("\n{}\n{}\n{}\n{}", originalFilename, fileName, suffix, targetRelativePathAndFileName);
-
-        if (!fileName.matches("^.+\\.(?i)(xls)$") && !fileName.matches("^.+\\.(?i)(xlsx)$")) {
-            throw new UnifiedOrderRuntimeException(ExceptionMsg.SYS_ERROR.getCode(), "上传文件格式不正确");
-        }
-
-        boolean isExcel2003 = true;
-        if (fileName.matches("^.+\\.(?i)(xlsx)$")) {
-            isExcel2003 = false;
-        }
-
-        // TODO 添加任务
-
-
-        String batchId = snowflake.nextIdStr();
-
-        SysQuartzScheduleTaskStatementOfAccountJdParam form = SysQuartzScheduleTaskStatementOfAccountJdParam
-                .builder()
-                .batchId(batchId)
-
-                // 此不是说来源是商品维度,而是说用商品维度去产生对账单 订单维度只有老版本才用
-                .dimCreateBy(AccountingOrderDimCreateByEnum.商品.getKey())
-
-                .statementOfAccountName(originalFilename)
-                // 对账单类型 1-客户结算;2-供应商结算;21-供应商结算-京东; 引用 enum SysQuartzScheduleTaskStatementOfAccountStatementOfAccountTypeEnum
-                .statementOfAccountType(statementOfAccountType)
-                .thirdPartAccountingOrderSn(thirdPartAccountingOrderSn)
-                .remark(remark)
-
-                // .serviceNo() // 里边的 供应商处理过程会填充
-
-                .sysOrgId(0L)
-                .sysVirtId(0L)
-                .outOrgId(0L)
-                .outVirtId(0L)
-
-                .sysMerchantId(0L)
-                .outMerchantId(saleId)
-
-                .cycleBeginTime(cycleBeginTime)
-                .cycleEndTime(cycleEndTime)
-
-                .isPause(SysQuartzScheduleTaskStatementOfAccountIsPauseEnum.暂停.getKey())
-                .jobId(0L)
-
-                .runState(ScheduleTaskRunStatusEnum.待导入.getKey())
-                .runTime(DateUtil.date())
-                .processState(ScheduleTaskProcessStateEnum.导入中.getKey())
-                // .processTime()
-                .accountingStatus(ScheduleTaskAccountingStatusEnum.待对账.getKey())
-                // .accountingTime()
-                .checkState(ScheduleTaskCheckStateEnum.待对账.getKey())
-                // .checkTime()
-
-                // .finishTime()
-                // .accountingOrderSn()
-                .params(AnJsonUtils.toJson(SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm
-                        .builder()
-                        .batchId(batchId)
-                        .excelExportPathRoot(excelExportPathRoot)
-                        .excelExportRelativePathTemplate(excelExportRelativePathTemplate)
-                        .excelExportRelativePathStorage(excelExportRelativePathStorage)
-                        .originalFilename(originalFilename)
-                        .fileName(fileName)
-                        .suffix(suffix)
-                        .relativePath(relativePath)
-                        .currentDate(currentDate)
-                        .targetRelativePathAndFileName(targetRelativePathAndFileName)
-                        .build()
-                ))
-                // .result()
-                // .paramsSnapshot()
-                .build();
-
-
-        int ret = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.addSysQuartzScheduleTaskStatementOfAccountJd(form, getToken());
-
-
-        if (ret == 0) {
-            return ResponseResultOuterUtils.createErrorResult("500", "失败");
-        } else {
-
-            /**************************************** head start ****************************************/
-
-            List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> resultHead = sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.queryGenericParam(
-                    SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria
-                            .builder()
-
-                            .batchId(form.getBatchId())
-
-                            .build(),
-                    getToken()
-            );
-
-            if (CollUtil.isEmpty(resultHead)) {
-                return ResponseResultOuterUtils.createErrorResult("500", "未查找到相关的信息");
-            }
-
-            SysQuartzScheduleTaskStatementOfAccountJdListItemVo responseData = resultHead.get(0);
-
-            /**************************************** head   end ****************************************/
-
-
-            return ResponseResultOuterUtils.createSuccesResult("创建成功", responseData);
-        }
-    }
-
-    /**
-     * 此功能定义为 从excel文件导入数据
-     * TODO 如果此 batchId 已经导入过 就要先删除这个记录
-     * http://192.168.6.223:8089/web/thirdpart/jd/reconciliation_schedule/import/excel/from/storage
-     *
-     * @param form
-     * @return
-     * @throws Exception
-     */
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op导入账单(上传excel与表单)-op手动导入数据(完整版 Full version)")
-    @RequestMapping(value = "import/excel/fullVersion/storage", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> excelImportFullVersion(@RequestBody SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form) throws Exception {
-
-        return ResponseResultOuterUtils.createSuccesResult(
-                sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService
-                        .asyncExcelImportFullVersion(
-                                form,
-                                getToken()
-                        )
-        );
-    }
-
-    /**
-     * 此功能定义为 从excel文件导入数据
-     * TODO 如果此 batchId 已经导入过 就要先删除这个记录
-     * http://192.168.6.2:8089/web/thirdpart/jd/reconciliation_schedule/import/excel/liteVersion/storage
-     *
-     * @param form
-     * @return
-     * @throws Exception
-     */
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op导入账单(上传excel与表单)-op手动导入数据(精简版 Lite version)")
-    @RequestMapping(value = "import/excel/liteVersion/storage", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> opExcelImportLiteVersion(@RequestBody SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form) throws Exception {
-
-        return ResponseResultOuterUtils.createSuccesResult(
-                sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService
-                        .asyncExcelImportLiteVersion(
-                                form,
-                                getToken()
-                        )
-        );
-    }
-
-
-    /**
-     * 步骤3:通过京东的订单数据-比对统一订单数据-生成报告
-     * http://192.168.6.2:8089/web/thirdpart/jd/reconciliation_schedule/check/up
-     *
-     * @param form
-     * @return
-     * @throws Exception
-     */
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op导入账单(上传excel与表单)-op手动导入数据-步骤3:通过京东的订单数据-比对统一订单数据-生成报告")
-    @RequestMapping(value = "check/up", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> opCompareOrderAndCheckUp(@RequestBody SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form) throws Exception {
-
-        return ResponseResultOuterUtils.createSuccesResult(
-                sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService
-                        .asyncCompareOrderAndCheckUpThenReport(
-                                form,
-                                getToken()
-                        )
-        );
-    }
-
-    @ApiOperation(value = "供应商结算-京东对账-op对账详情-Debug")
-    @RequestMapping(value = "checkUp/{batchId}/{jdOrderSn}", method = RequestMethod.POST)
-    @ResponseBody
-    public R<AccountingUnifiedSupplierOrderJdCheckUpReportSnapshotStruct> opCheckUpDebug(
-            @PathVariable String batchId,
-            @PathVariable String jdOrderSn
-    ) throws Exception {
-
-        log.info("\nopCheckUpDebug start \n{}\n{}\nopCheckUpDebug   end", batchId, jdOrderSn);
-
-        return ResponseResultOuterUtils.createSuccesResult(
-                "debuging",
-                accountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService
-                        .readSnapshotJson(
-                                batchId,
-                                jdOrderSn
-                        )
-        );
-    }
-
-
-    @ApiOperation(value = "供应商结算-京东对账-op列表-op导入账单(上传excel与表单)-op手动导入数据-步骤3:通过报告的异常数据-重新比对统一订单数据-生成报告")
-    @RequestMapping(value = "check/up/exception", method = RequestMethod.POST)
-    @ResponseBody
-    public R<String> opCompareOrderAndCheckUpOnlyException(@RequestBody SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form) throws Exception {
-
-        return ResponseResultOuterUtils.createSuccesResult(
-                sysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService
-                        .asyncCompareOrderAndCheckUpThenReportOnlyException(
-                                form,
-                                getToken()
-                        )
-        );
-    }
-
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/dubbo/consumer/thirdpart/jd/AccountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService.java

@@ -1,168 +0,0 @@
-package cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd;
-
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.JwtUtil;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReport;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportParam;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.*;
-import cn.superdesk.uniorder.dubbo.facade.thirdpart.jd.DubboAccountingUnifiedSupplierOrderJdCheckUpReportService;
-import com.alibaba.dubbo.config.annotation.Reference;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 京东对账单中的订单 算是临时 sheet eg 深圳市侨城汇网络科技有限公司-2021年8月1日集采账单.xlsx
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-14 17:04:08
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-14 17:04:08
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Component
-public class AccountingUnifiedSupplierOrderJdCheckUpReportDubboConsumerService {
-
-    @Reference(version = "1.0.0", timeout = 10000, retries = -1)
-    private DubboAccountingUnifiedSupplierOrderJdCheckUpReportService dubboAccountingUnifiedSupplierOrderJdCheckUpReportService;
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    public void addObj(AccountingUnifiedSupplierOrderJdCheckUpReportParam param) {
-
-        dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.addObj(param);
-
-    }
-
-    public void updateObj(AccountingUnifiedSupplierOrderJdCheckUpReportParam param) {
-
-        dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.updateObj(param);
-    }
-
-    public void deleteObj(Long id) {
-
-        dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.deleteObj(id);
-    }
-
-    public AccountingUnifiedSupplierOrderJdCheckUpReport findById(Long id) {
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.findById(id);
-    }
-
-    public PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReport> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.findByPaging(conditions, pageNun, pageSize);
-    }
-
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReport> findAll(Map<String, Object> queryMap) {
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.findAll(queryMap);
-    }
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    public void addAccountingUnifiedSupplierOrderJdCheckUpReport(AccountingUnifiedSupplierOrderJdCheckUpReportParam param) {
-
-        dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.addAccountingUnifiedSupplierOrderJdCheckUpReport(param);
-    }
-
-
-    public void updateAccountingUnifiedSupplierOrderJdCheckUpReport(AccountingUnifiedSupplierOrderJdCheckUpReportParam param) {
-
-        dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.updateAccountingUnifiedSupplierOrderJdCheckUpReport(param);
-    }
-
-
-    public void deleteAccountingUnifiedSupplierOrderJdCheckUpReport(Long id) {
-        dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.deleteAccountingUnifiedSupplierOrderJdCheckUpReport(id);
-    }
-
-
-    public AccountingUnifiedSupplierOrderJdCheckUpReport findAccountingUnifiedSupplierOrderJdCheckUpReportById(Long id) {
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.findAccountingUnifiedSupplierOrderJdCheckUpReportById(id);
-    }
-
-
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReport>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize) {
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.pageQuery(conditions, pageNun, pageSize);
-    }
-
-
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVo>> pageQueryGenericParam(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.pageQueryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportListItemVoWoof>> pageQueryGenericWoof(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.pageQueryGenericWoof(queryCriteria, loginSysUser);
-    }
-
-    public AccountingUnifiedSupplierOrderJdCheckUpReportDetailStatisticsVo pageQueryHeadGenericParam(AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria, String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.pageQueryHeadGenericParam(queryCriteria, loginSysUser);
-    }
-
-    /****************************************** 检查 start  ******************************************/
-
-    public R<String> checkUpAndReportDimOrder(
-            SysQuartzScheduleTaskStatementOfAccountJdListItemVo listItemVo,
-            AccountingUnifiedSupplierOrderJdListItemVo itemVo) {
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.checkUpAndReportDimOrder(listItemVo, itemVo);
-    }
-
-    public AccountingUnifiedSupplierOrderJdCheckUpReportSnapshotStruct readSnapshotJson(String batchId, String jdOrderSn) {
-
-        log.info("\nopCheckUpDebug start \n{}\n{}\nopCheckUpDebug   end", batchId, jdOrderSn);
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportService.readSnapshotJson(batchId, jdOrderSn);
-    }
-
-    /****************************************** 检查   end ******************************************/
-
-    /****************************************** export excel start ******************************************/
-
-    public String exportExcelJdCheckUpReportFullVersion(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportService
-                .exportExcelJdCheckUpReportFullVersion(queryCriteria, loginSysUser);
-    }
-
-    public String exportExcelJdCheckUpReportLiteVersion(
-            AccountingUnifiedSupplierOrderJdCheckUpReportQueryCriteria queryCriteria,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportService
-                .exportExcelJdCheckUpReportLiteVersion(queryCriteria, loginSysUser);
-    }
-
-    /****************************************** export excel   end ******************************************/
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/dubbo/consumer/thirdpart/jd/AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsDubboConsumerService.java

@@ -1,117 +0,0 @@
-package cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd;
-
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.JwtUtil;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoods;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsHeadVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo;
-import cn.superdesk.uniorder.dubbo.consumer._permission.PermissionDubboCustomerService;
-import cn.superdesk.uniorder.dubbo.facade.thirdpart.jd.DubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService;
-import com.alibaba.dubbo.config.annotation.Reference;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * @Description:
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2022-06-22 16:27:47
- * @UpdateUser: linjinyu
- * @UpdateDate: 2022-06-22 16:27:47
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Component
-public class AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsDubboConsumerService {
-
-    @Reference(version = "1.0.0", timeout = 10000, retries = -1)
-    private DubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService;
-
-    @Resource
-    private PermissionDubboCustomerService permissionDubboCustomerService;
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    public int insertSelective(AccountingUnifiedSupplierOrderJdCheckUpReportXGoods entity) {
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.insertSelective(entity);
-
-    }
-
-    public int updateByPrimaryKeySelective(AccountingUnifiedSupplierOrderJdCheckUpReportXGoods entity) {
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.updateByPrimaryKeySelective(entity);
-    }
-
-    public void deleteObj(Long id) {
-
-        dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.deleteObj(id);
-    }
-
-    public AccountingUnifiedSupplierOrderJdCheckUpReportXGoods findById(Long id) {
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.findById(id);
-    }
-
-    @Deprecated
-    public PageInfo<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.findByPaging(conditions, pageNun, pageSize);
-    }
-
-    @Deprecated
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoods> findAll(Map<String, Object> queryMap) {
-
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.findAll(queryMap);
-    }
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    public int addAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam param, String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.addAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(param, loginSysUser);
-    }
-
-    public int updateAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsParam param, String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.updateAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(param, loginSysUser);
-    }
-
-    public int deleteAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(Long id, String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.deleteAccountingUnifiedSupplierOrderJdCheckUpReportXGoods(id, loginSysUser);
-    }
-
-    public AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo findListItemVoById(Long id, String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.findListItemVoById(id, loginSysUser);
-    }
-
-    public R<List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo>> pageQueryGenericParam(AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria, String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.pageQueryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    public List<AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsListItemVo> queryGenericParam(AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria, String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.queryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    public AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsHeadVo queryHeadGenericParam(AccountingUnifiedSupplierOrderJdCheckUpReportXGoodsQueryCriteria queryCriteria, String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboAccountingUnifiedSupplierOrderJdCheckUpReportXGoodsService.queryHeadGenericParam(queryCriteria, loginSysUser);
-    }
-
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/dubbo/consumer/thirdpart/jd/AccountingUnifiedSupplierOrderJdDubboConsumerService.java

@@ -1,197 +0,0 @@
-package cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd;
-
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.JwtUtil;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.AccountingUnifiedSupplierOrderJd;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdParam;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.AccountingUnifiedSupplierOrderJdQueryCriteria;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdDetailStatisticsVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdListItemVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.AccountingUnifiedSupplierOrderJdUpperLevelsStatisticsVo;
-import cn.superdesk.uniorder.dubbo.facade.thirdpart.jd.DubboAccountingUnifiedSupplierOrderJdService;
-import com.alibaba.dubbo.config.annotation.Reference;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 京东对账单中的订单 算是临时 sheet eg 深圳市侨城汇网络科技有限公司-2021年8月1日集采账单.xlsx
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-12 11:29:24
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-12 11:29:24
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Component
-public class AccountingUnifiedSupplierOrderJdDubboConsumerService {
-
-    @Reference(version = "1.0.0", timeout = 10000, retries = -1)
-    private DubboAccountingUnifiedSupplierOrderJdService dubboAccountingUnifiedSupplierOrderJdService;
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    public void addObj(AccountingUnifiedSupplierOrderJdParam param) {
-
-        dubboAccountingUnifiedSupplierOrderJdService.addObj(param);
-
-    }
-
-    public void updateObj(AccountingUnifiedSupplierOrderJdParam param) {
-
-        dubboAccountingUnifiedSupplierOrderJdService.updateObj(param);
-    }
-
-    public void deleteObj(Long id) {
-
-        dubboAccountingUnifiedSupplierOrderJdService.deleteObj(id);
-    }
-
-    public AccountingUnifiedSupplierOrderJd findById(Long id) {
-
-        return dubboAccountingUnifiedSupplierOrderJdService.findById(id);
-    }
-
-    public PageInfo<AccountingUnifiedSupplierOrderJd> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-
-        return dubboAccountingUnifiedSupplierOrderJdService.findByPaging(conditions, pageNun, pageSize);
-    }
-
-    public List<AccountingUnifiedSupplierOrderJd> findAll(Map<String, Object> queryMap) {
-
-        return dubboAccountingUnifiedSupplierOrderJdService.findAll(queryMap);
-    }
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    public void addAccountingUnifiedSupplierOrderJd(AccountingUnifiedSupplierOrderJdParam param) {
-
-        dubboAccountingUnifiedSupplierOrderJdService.addAccountingUnifiedSupplierOrderJd(param);
-    }
-
-
-    public void updateAccountingUnifiedSupplierOrderJd(AccountingUnifiedSupplierOrderJdParam param) {
-
-        dubboAccountingUnifiedSupplierOrderJdService.updateAccountingUnifiedSupplierOrderJd(param);
-    }
-
-
-    public void deleteAccountingUnifiedSupplierOrderJd(Long id) {
-        dubboAccountingUnifiedSupplierOrderJdService.deleteAccountingUnifiedSupplierOrderJd(id);
-    }
-
-
-    public AccountingUnifiedSupplierOrderJd findAccountingUnifiedSupplierOrderJdById(Long id) {
-
-        return dubboAccountingUnifiedSupplierOrderJdService.findAccountingUnifiedSupplierOrderJdById(id);
-    }
-
-
-    public R<List<AccountingUnifiedSupplierOrderJd>> pageQuery(Map<String, Object> conditions, int pageNun, int pageSize) {
-
-        return dubboAccountingUnifiedSupplierOrderJdService.pageQuery(conditions, pageNun, pageSize);
-    }
-
-
-    public R<List<AccountingUnifiedSupplierOrderJdListItemVo>> pageQueryGenericParam(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboAccountingUnifiedSupplierOrderJdService.pageQueryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    public List<AccountingUnifiedSupplierOrderJdListItemVo> queryGenericParam(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboAccountingUnifiedSupplierOrderJdService.queryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    public AccountingUnifiedSupplierOrderJdDetailStatisticsVo pageQueryHeadGenericParam(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboAccountingUnifiedSupplierOrderJdService.pageQueryHeadGenericParam(queryCriteria, loginSysUser);
-    }
-
-    public AccountingUnifiedSupplierOrderJdUpperLevelsStatisticsVo statisticsQuantityDimOrderNormalOrException(
-            AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria,
-            String token){
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboAccountingUnifiedSupplierOrderJdService.statisticsQuantityDimOrderNormalOrException(queryCriteria, loginSysUser);
-    }
-
-
-    /****************************************** excel import start start ******************************************/
-
-    public String exportExcelJdImportRecord(AccountingUnifiedSupplierOrderJdQueryCriteria queryCriteria, String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboAccountingUnifiedSupplierOrderJdService.exportExcelJdImportRecord(queryCriteria, loginSysUser);
-    }
-
-
-    /**
-     * 完整版
-     *
-     * @param excelRow
-     * @param token
-     */
-    public void saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRow(AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow excelRow, String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        dubboAccountingUnifiedSupplierOrderJdService.saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRow(excelRow, loginSysUser);
-    }
-
-    /**
-     * 完整版
-     *
-     * @param excelRowList
-     * @param token
-     */
-    public void saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRowList(List<AccountingUnifiedSupplierOrderJdImportFullVersionExcelRow> excelRowList, String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        dubboAccountingUnifiedSupplierOrderJdService.saveOrUpdate4ThirdPartJdReconciliationScheduleFullVersionExcelRowList(excelRowList, loginSysUser);
-    }
-
-    /**
-     * 精简版
-     *
-     * @param excelRow
-     * @param token
-     */
-    public void saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRow(AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow excelRow, String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        dubboAccountingUnifiedSupplierOrderJdService.saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRow(excelRow, loginSysUser);
-    }
-
-    /**
-     * 精简版
-     *
-     * @param excelRowList
-     * @param token
-     */
-    public void saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRowList(List<AccountingUnifiedSupplierOrderJdImportLiteVersionExcelRow> excelRowList, String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        dubboAccountingUnifiedSupplierOrderJdService.saveOrUpdate4ThirdPartJdReconciliationScheduleLiteVersionExcelRowList(excelRowList, loginSysUser);
-    }
-
-    /****************************************** excel import start   end ******************************************/
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/dubbo/consumer/thirdpart/jd/SysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService.java

@@ -1,235 +0,0 @@
-package cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd;
-
-import cn.superdesk.uniorder.common.rest.response.R;
-import cn.superdesk.uniorder.common.security.JwtUtil;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dao.entity.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJd;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.*;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdHeadVo;
-import cn.superdesk.uniorder.dto.vo.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdListItemVo;
-import cn.superdesk.uniorder.dubbo.consumer._permission.PermissionDubboCustomerService;
-import cn.superdesk.uniorder.dubbo.facade.thirdpart.jd.DubboSysQuartzScheduleTaskStatementOfAccountJdService;
-import com.alibaba.dubbo.config.annotation.Reference;
-import com.github.pagehelper.PageInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 定时任务-时刻任务-对账单
- * @Author: linjinyu
- * @Email linjinyu@avic-s.com
- * @CreateDate: 2021-10-12 11:29:24
- * @UpdateUser: linjinyu
- * @UpdateDate: 2021-10-12 11:29:24
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Component
-public class SysQuartzScheduleTaskStatementOfAccountJdDubboConsumerService {
-
-    @Reference(version = "1.0.0", timeout = 60000, retries = -1)
-    private DubboSysQuartzScheduleTaskStatementOfAccountJdService dubboSysQuartzScheduleTaskStatementOfAccountJdService;
-
-    @Resource
-    private PermissionDubboCustomerService permissionDubboCustomerService;
-
-
-    /****************************************** extends BaseService 部分 start ******************************************/
-
-    public int insertSelective(SysQuartzScheduleTaskStatementOfAccountJd entity) {
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.insertSelective(entity);
-
-    }
-
-    public int updateByPrimaryKeySelective(SysQuartzScheduleTaskStatementOfAccountJd entity) {
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.updateByPrimaryKeySelective(entity);
-    }
-
-    public void deleteObj(Long id) {
-
-        dubboSysQuartzScheduleTaskStatementOfAccountJdService.deleteObj(id);
-    }
-
-    public SysQuartzScheduleTaskStatementOfAccountJd findById(Long id) {
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.findById(id);
-    }
-
-    @Deprecated
-    public PageInfo<SysQuartzScheduleTaskStatementOfAccountJd> findByPaging(Map<String, Object> conditions, Integer pageNun, Integer pageSize) {
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.findByPaging(conditions, pageNun, pageSize);
-    }
-
-    @Deprecated
-    public List<SysQuartzScheduleTaskStatementOfAccountJd> findAll(Map<String, Object> queryMap) {
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.findAll(queryMap);
-    }
-
-    /****************************************** extends BaseService 部分   end ******************************************/
-
-
-    public int addSysQuartzScheduleTaskStatementOfAccountJd(SysQuartzScheduleTaskStatementOfAccountJdParam param, String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.addSysQuartzScheduleTaskStatementOfAccountJd(param, loginSysUser);
-    }
-
-
-    public int updateSysQuartzScheduleTaskStatementOfAccountJd(SysQuartzScheduleTaskStatementOfAccountJdParam param, String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.updateSysQuartzScheduleTaskStatementOfAccountJd(param, loginSysUser);
-    }
-
-
-    public int deleteSysQuartzScheduleTaskStatementOfAccountJd(Long id, String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.deleteSysQuartzScheduleTaskStatementOfAccountJd(id, loginSysUser);
-    }
-
-
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo findListItemVoById(Long id, String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.findListItemVoById(id, loginSysUser);
-    }
-
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo findListItemVoByBatchId(String batchId, String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.findListItemVoByBatchId(batchId, loginSysUser);
-    }
-
-
-    public R<List<SysQuartzScheduleTaskStatementOfAccountJd>> pageQuery(
-            Map<String, Object> conditions,
-            int pageNun,
-            int pageSize) {
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.pageQuery(conditions, pageNun, pageSize);
-    }
-
-
-    public R<List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo>> pageQueryGenericParam(
-            SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.pageQueryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    public SysQuartzScheduleTaskStatementOfAccountJdHeadVo queryHeadGenericParam(
-            SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.queryHeadGenericParam(queryCriteria, loginSysUser);
-    }
-
-
-    public List<SysQuartzScheduleTaskStatementOfAccountJdListItemVo> queryGenericParam(
-            SysQuartzScheduleTaskStatementOfAccountJdQueryCriteria queryCriteria,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.queryGenericParam(queryCriteria, loginSysUser);
-    }
-
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo deQueueOneImportExcel(String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.deQueueOneImportExcel(loginSysUser);
-    }
-
-    public SysQuartzScheduleTaskStatementOfAccountJdListItemVo deQueueOneCompareOrderAndCheckUpThenReport(String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.deQueueOneCompareOrderAndCheckUpThenReport(loginSysUser);
-    }
-
-
-    public int opSetRemark(
-            SysQuartzScheduleTaskStatementOfAccountJdOpSetRemarkForm form,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.opSetRemark(form, loginSysUser);
-    }
-
-    public int opSetIsPause(
-            SysQuartzScheduleTaskStatementOfAccountJdOpSetIsPauseForm form,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.opSetIsPause(form, loginSysUser);
-    }
-
-    public String asyncExcelImportFullVersion(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.asyncExcelImportFullVersion(form, loginSysUser);
-
-    }
-
-    public String asyncExcelImportLiteVersion(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.asyncExcelImportLiteVersion(form, loginSysUser);
-    }
-
-    /****************************************** 检查 start ******************************************/
-
-    /**
-     * 步骤3:通过京东的订单数据-比对统一订单数据-生成报告
-     * 检查 比对
-     *
-     * @param form
-     * @param token
-     * @return
-     */
-    public String asyncCompareOrderAndCheckUpThenReport(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.asyncCompareOrderAndCheckUpThenReport(form, loginSysUser);
-    }
-
-    /**
-     * 步骤3:通过报告的异常数据-重新比对统一订单数据-生成报告
-     *
-     * @param form
-     * @param token
-     * @return
-     */
-    public String asyncCompareOrderAndCheckUpThenReportOnlyException(
-            SysQuartzScheduleTaskStatementOfAccountJdRunExcelImportForm form,
-            String token) {
-
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdService.asyncCompareOrderAndCheckUpThenReportOnlyException(form, loginSysUser);
-    }
-}

superdesk-uniorder-web/src/main/java/cn/superdesk/uniorder/dubbo/consumer/thirdpart/jd/SysQuartzScheduleTaskStatementOfAccountJdExOpPartDubboConsumerService.java

@@ -1,70 +0,0 @@
-package cn.superdesk.uniorder.dubbo.consumer.thirdpart.jd;
-
-import cn.superdesk.uniorder.common.security.JwtUtil;
-import cn.superdesk.uniorder.common.security.dto.LoginSysUser;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpCancelForm;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpConfirmForm;
-import cn.superdesk.uniorder.dto.param.thirdpart.jd.SysQuartzScheduleTaskStatementOfAccountJdOpDeleteForm;
-import cn.superdesk.uniorder.dubbo.consumer._permission.PermissionDubboCustomerService;
-import cn.superdesk.uniorder.dubbo.facade.thirdpart.jd.DubboSysQuartzScheduleTaskStatementOfAccountJdExOpPartService;
-import com.alibaba.dubbo.config.annotation.Reference;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-
-/**
- * @Description:
- * @Author: linjinyu
- * @CreateDate: 10/12/20 4:28 PM
- * @UpdateUser: linjinyu
- * @UpdateDate: 10/12/20 4:28 PM
- * @UpdateRemark: 修改内容
- * @Version: 1.0
- */
-@Slf4j
-@Component
-public class SysQuartzScheduleTaskStatementOfAccountJdExOpPartDubboConsumerService {
-
-    @Reference(version = "1.0.0", timeout = 300000, retries = -1)
-    private DubboSysQuartzScheduleTaskStatementOfAccountJdExOpPartService dubboSysQuartzScheduleTaskStatementOfAccountJdExOpPartService;
-
-    @Resource
-    private PermissionDubboCustomerService permissionDubboCustomerService;
-
-    /**
-     * 供应商结算-京东对账-op列表-op删除任务
-     *
-     * @param form
-     * @param token
-     * @return
-     */
-    public int opDelete(SysQuartzScheduleTaskStatementOfAccountJdOpDeleteForm form, String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdExOpPartService.opDelete(form, loginSysUser);
-    }
-
-    /**
-     * 供应商结算-京东对账-op列表-op取消账单
-     *
-     * @param form
-     * @param token
-     */
-    public int opCancel(SysQuartzScheduleTaskStatementOfAccountJdOpCancelForm form, String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdExOpPartService.opCancel(form, loginSysUser);
-    }
-
-    /**
-     * 供应商结算-京东对账-op列表-op确认账单
-     *
-     * @param form
-     * @param token
-     */
-    public int opConfirm(SysQuartzScheduleTaskStatementOfAccountJdOpConfirmForm form, String token) {
-        LoginSysUser loginSysUser = JwtUtil.getLoginSysUser(token);
-        return dubboSysQuartzScheduleTaskStatementOfAccountJdExOpPartService.opConfirm(form, loginSysUser);
-    }
-
-}