From 7cbe772af4feef60a0f556b635e485698982c350 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 1 May 2023 14:20:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feature=201.=E4=BC=98=E5=8C=96=E9=9B=86?= =?UTF-8?q?=E5=9B=A2=E7=89=A9=E6=96=99=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml index 96af0306..ca65501d 100644 --- a/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml +++ b/order-management-consumer/src/main/resources/mybatis/mapper/GroupCommodityCodeMapper.xml @@ -117,8 +117,6 @@ cc.wlflbm, cc.wlflmc FROM commodity_code cc - LEFT JOIN group_commodity gc - ON gc.id = cc.group_id cc.xhf_nsrsbh = '-1' From 0f9c8fd98d78ca6d5fd2a2a3e990bcf09d8776e0 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 1 May 2023 15:34:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feature=201.=E5=8F=91=E9=80=81=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E5=A4=9A=E7=BA=BF=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OrderInvoiceInfoServiceImpl.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java index a7b28b3f..d10c78d0 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OrderInvoiceInfoServiceImpl.java @@ -6,7 +6,6 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson.JSONObject; import com.dxhy.base.file.common.ExcelReadContext; import com.dxhy.base.file.handle.ExcelExportHandle; import com.dxhy.order.baseservice.config.BaseServiceConfig; @@ -54,13 +53,18 @@ import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.joda.time.DateTime; import org.joda.time.Duration; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.io.*; -import java.nio.charset.StandardCharsets; -import java.text.SimpleDateFormat; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executor; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @@ -116,6 +120,9 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { @Resource private InvoiceKpdInfoService invoiceKpdInfoService; + @Autowired + @Qualifier("asyncExecutor") + private Executor voucherTaskExecutor; /** @@ -1115,8 +1122,9 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { salerWarningService.pushExceptionMessageToItax(orderInvoiceInfo); // 异常订单发送邮件 - emailService.sendEmailOfInnormalOrder(orderInvoiceInfo, OrderInfoEnum.ORDER_STATUS_6.getValue(), rabbitMqCommonInvoice.getSbyy()); - + CompletableFuture.runAsync(()->{ + emailService.sendEmailOfInnormalOrder(orderInvoiceInfo, OrderInfoEnum.ORDER_STATUS_6.getValue(), rabbitMqCommonInvoice.getSbyy()); + }, voucherTaskExecutor); //处理开票失败后,推送销项后台开票控制逻辑 processSimsBackPauseInvoice(orderInvoiceInfo.getSkcwdm(), orderInvoiceInfo.getSbyy(), orderInvoiceInfo.getXhfNsrsbh(), orderInvoiceInfo.getEntId()); From 8d10008b669a8ab13e399c4c731f235c4a84da25 Mon Sep 17 00:00:00 2001 From: "zhenghaiyang@ele-cloud.com" Date: Mon, 1 May 2023 16:34:37 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feature=201.=E6=96=B0=E5=A2=9E=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=A8=8E=E6=8E=A7=E8=AE=BE=E5=A4=87=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SimsBackController.java | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/controller/SimsBackController.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/controller/SimsBackController.java index fe81c96a..a122079e 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/controller/SimsBackController.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/controller/SimsBackController.java @@ -1,18 +1,15 @@ package com.dxhy.order.baseservice.module.thirdservice.simsback.controller; -import com.dxhy.order.model.R; -import com.dxhy.order.model.TaxEquipmentInfo; -import com.dxhy.order.utils.JsonUtils; import com.dxhy.order.baseservice.module.thirdservice.simsback.model.PageQueryTaxEquipment; import com.dxhy.order.baseservice.module.thirdservice.simsback.service.SimsBackService; import com.dxhy.order.baseservice.openapi.protocol.back.PageQueryGroupTaxEquipmentReq; +import com.dxhy.order.model.R; +import com.dxhy.order.model.TaxEquipmentInfo; +import com.dxhy.order.utils.JsonUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -60,4 +57,17 @@ public class SimsBackController { return R.ok(dataList); } + + /** + * 对外重新缓存税控设备 + * + * @param reCacheSksb + * @return + */ + @ApiOperation(value = "订单对外接口-对外重新缓存税控设备", notes = "订单对外接口-对外重新缓存税控设备") + @RequestMapping(value = "/reCacheSksb", method = RequestMethod.POST) + public R reCacheSksb(@RequestParam String nsrsbh,@RequestParam String entId ) { + simsBackService.reCacheTaxEquipmentInfo(nsrsbh,entId); + return R.ok(); + } }