Merge branch 'release' of http://10.1.1.216/xm/sdenergy/sims/sims-order-sdenergy into release

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();
+    }
 }

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
         <where>
             cc.xhf_nsrsbh = '-1'
             <if test="wlflbm != null and wlflbm != ''">

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());