From d101a6ff1d9ee81d45057e843e986b9fabd27dc5 Mon Sep 17 00:00:00 2001 From: liujie Date: Tue, 23 Jul 2024 11:51:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=90=8C=E6=AD=A5U8=E8=A2=AB?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/ueight/job/OrderU8Controller.java | 30 ++++++++++++++++++- .../Invoice/InvoiceInfoMapper.xml | 23 ++++++++++++++ .../customer/CustomerMapper.xml | 10 +++++++ .../Invoice/service/CrmInvoiceService.java | 13 ++++++++ .../u8/ueight/service/CustomerService.java | 11 +++++++ 5 files changed, 86 insertions(+), 1 deletion(-) diff --git a/crm-admin/src/main/java/com/yb/lb/webapp/ueight/job/OrderU8Controller.java b/crm-admin/src/main/java/com/yb/lb/webapp/ueight/job/OrderU8Controller.java index d403170..e7a1e4d 100644 --- a/crm-admin/src/main/java/com/yb/lb/webapp/ueight/job/OrderU8Controller.java +++ b/crm-admin/src/main/java/com/yb/lb/webapp/ueight/job/OrderU8Controller.java @@ -1,8 +1,11 @@ package com.yb.lb.webapp.ueight.job; +import com.yb.lb.common.utils.DateUtil; import com.yb.lb.common.utils.ErrorUtils; import com.yb.lb.common.utils.FINALCMD; +import com.yb.lb.webapp.Invoice.service.CrmInvoiceService; import com.yb.lb.webapp.message.service.MessageService; +import com.yb.lb.webapp.u8.ueight.service.CustomerService; import com.yb.lb.webapp.u8.ueight.service.OrderCronService; import com.yb.lb.webapp.u8.ueight.service.OrderUeightService; import org.slf4j.Logger; @@ -10,6 +13,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,6 +29,10 @@ public class OrderU8Controller { MessageService messageService; @Autowired OrderCronService orderCronService; + @Autowired + CrmInvoiceService crmInvoiceService; + @Autowired + CustomerService customerService; public Map findClassOne() { Map result = new HashMap<>(); @@ -61,7 +69,27 @@ public class OrderU8Controller { */ public void delOrder() { try { - + //查询sqlserver2的008账套 + String time = DateUtil.getDay(); + Map params = new HashMap(); + //第一次不添加时间参数 + if (!"2024-07-24".equals(time)) { + params.put("isTime", "1"); + } + List deleteRdRecord32List = customerService.findU8List(params, ".findSqlServer2008List"); + String invoiceInfoIds = ""; + if (deleteRdRecord32List.size() > 0) { + //条件查询出库单主表主键 + for (Map deleteRdRecordMap : deleteRdRecord32List) { + Map map = crmInvoiceService.oneById(deleteRdRecordMap, ".selectOneByCondition"); + if (map != null) { + invoiceInfoIds += map.get("id") + "-"; + } + } + //删除子表及关联的主表 + crmInvoiceService.delInvoiceDetailAndInfoByIds(invoiceInfoIds, ".delInvoiceDetailByIds"); + crmInvoiceService.delInvoiceDetailAndInfoByIds(invoiceInfoIds, ".delInvoiceInfoByIds"); + } } catch (Exception e) { logger.debug("delOrderJob-Exception:" + e.getMessage()); e.printStackTrace(); diff --git a/crm-common/src/main/resources/mapper/mapper_oracle/Invoice/InvoiceInfoMapper.xml b/crm-common/src/main/resources/mapper/mapper_oracle/Invoice/InvoiceInfoMapper.xml index 5348827..545ce38 100644 --- a/crm-common/src/main/resources/mapper/mapper_oracle/Invoice/InvoiceInfoMapper.xml +++ b/crm-common/src/main/resources/mapper/mapper_oracle/Invoice/InvoiceInfoMapper.xml @@ -764,4 +764,27 @@ GROUP BY GOODS_TYPE_ID,GOODS_TYPE_NAME,REGION,NAME + + + + + + + DELETE FROM CRM_INVOICE_DETAIL + WHERE instr(#{invoiceInfoIds},INVOICE_ID) > 0 + + + + + DELETE FROM CRM_INVOICE_INFO + WHERE instr(#{invoiceInfoIds},id) > 0 + \ No newline at end of file diff --git a/crm-common/src/main/resources/mapper/mapper_sqlserver/customer/CustomerMapper.xml b/crm-common/src/main/resources/mapper/mapper_sqlserver/customer/CustomerMapper.xml index f4af150..56a5603 100644 --- a/crm-common/src/main/resources/mapper/mapper_sqlserver/customer/CustomerMapper.xml +++ b/crm-common/src/main/resources/mapper/mapper_sqlserver/customer/CustomerMapper.xml @@ -200,4 +200,14 @@ UPDATE crm_contact set ${attributeKey} = #{value} WHERE cCusCode = #{cCusCode} AND cContactCode = #{cContactCode} + + + \ No newline at end of file diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/Invoice/service/CrmInvoiceService.java b/crm-webapp/src/main/java/com/yb/lb/webapp/Invoice/service/CrmInvoiceService.java index 9fb687a..4000948 100644 --- a/crm-webapp/src/main/java/com/yb/lb/webapp/Invoice/service/CrmInvoiceService.java +++ b/crm-webapp/src/main/java/com/yb/lb/webapp/Invoice/service/CrmInvoiceService.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ZipUtil; import com.github.pagehelper.PageInfo; import com.yb.lb.common.base.oracle.BaseOracleDao; +import com.yb.lb.common.base.sqlserver2.BaseSqlServer2Dao; import com.yb.lb.common.config.UserConfig; import com.yb.lb.common.utils.*; import com.yb.lb.webapp.Invoice.entity.InvoiceDetail; @@ -12,8 +13,10 @@ import com.yb.lb.webapp.Invoice.entity.InvoiceInfo; import com.yb.lb.webapp.goodsinfo.goods.entity.GoodsInfo; import com.yb.lb.webapp.random.service.RandomService; import com.yb.lb.webapp.redis.service.RedisService; +import com.yb.lb.webapp.u8.ueight.entity.CustomerInfo; import com.yb.lb.webapp.u8.ueight.service.OrderUeightService; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,6 +46,8 @@ public class CrmInvoiceService { OrderUeightService orderUeightService; @Autowired RedisService redisService; + @Autowired + BaseSqlServer2Dao dao2; /** * 新增 @@ -345,4 +350,12 @@ public class CrmInvoiceService { } } + /** + * @description: 删除子表及关联的主表 + * @author: lj + * @date: 2024/07/23 + **/ + public boolean delInvoiceDetailAndInfoByIds(@Param("invoiceInfoIds") String invoiceInfoIds, String id) { + return dao.delete(InvoiceInfo.class.getName() + id, invoiceInfoIds); + } } diff --git a/crm-webapp/src/main/java/com/yb/lb/webapp/u8/ueight/service/CustomerService.java b/crm-webapp/src/main/java/com/yb/lb/webapp/u8/ueight/service/CustomerService.java index e0f2863..4b155b3 100644 --- a/crm-webapp/src/main/java/com/yb/lb/webapp/u8/ueight/service/CustomerService.java +++ b/crm-webapp/src/main/java/com/yb/lb/webapp/u8/ueight/service/CustomerService.java @@ -7,6 +7,7 @@ import com.yb.lb.common.utils.DateUtil; import com.yb.lb.common.utils.ErrorUtils; import com.yb.lb.common.utils.FINALCMD; import com.yb.lb.common.utils.ListOrMapForJson; +import com.yb.lb.webapp.Invoice.entity.InvoiceInfo; import com.yb.lb.webapp.u8.ueight.entity.CustomerInfo; import com.yb.lb.webapp.u8.ueight.entity.UeightOracle; import org.springframework.beans.factory.annotation.Autowired; @@ -348,4 +349,14 @@ public class CustomerService { return map; } + + /** + * @description: 查询全部(sqlserver2) + * @author: lj + * @date: 2024/07/23 + **/ + public List findU8List(Map params, String id) { + return dao.list(CustomerInfo.class.getName() + id, params); + } + }