Merge branch 'feature/sksbCode_redis' into test

# Conflicts:
#	order-management-consumer/src/main/java/com/dxhy/order/consumer/constant/ExcelErrorMessageEnum.java

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/simsback/service/impl/SimsBackServiceImpl.java

@@ -232,7 +232,7 @@ public class SimsBackServiceImpl implements SimsBackService {
             } catch (Exception e) {
                 log.error("{}调用销项后台获取税控设备接口异常:{}", LOGGER_MSG, e);
             }
-            if (ObjectUtil.isNotNull(taxEquipmentInfo)) {
+            if (ObjectUtil.isNotNull(taxEquipmentInfo)&&StringUtils.isNotBlank(taxEquipmentInfo.getSksbCode())) {
                 log.debug("{}调用销项后台获取税控设备返回数据为:{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(taxEquipmentInfo));
                 //增加缓存逻辑
                 redisService.set(sksbKey, JsonUtils.getInstance().toJsonString(taxEquipmentInfo), RedisConstant.REDIS_EXPIRE_TIME_2HOUR);

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -27,7 +27,6 @@ import com.dxhy.order.baseservice.utils.BaseServiceBeanTransitionUtils;
 import com.dxhy.order.constant.*;
 import com.dxhy.order.consumer.dao.GroupCommodityCodeMapper;
 import com.dxhy.order.consumer.dao.GsClientMapper;
-import com.dxhy.order.consumer.dao.OrderBatchRequestMapper;
 import com.dxhy.order.consumer.dao.OrderProcessInfoMapper;
 import com.dxhy.order.consumer.model.OderDetailInfo;
 import com.dxhy.order.consumer.model.PageOrderExt;
@@ -36,8 +35,8 @@ import com.dxhy.order.consumer.modules.order.model.PageInvoiceItem;
 import com.dxhy.order.consumer.modules.order.model.PageKySlReq;
 import com.dxhy.order.consumer.modules.order.model.PageKySlRsp;
 import com.dxhy.order.consumer.modules.order.model.bo.YwlxCountTotalBO;
-import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoVo;
 import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoTotalAmountVO;
+import com.dxhy.order.consumer.modules.order.model.vo.OrderInfoVo;
 import com.dxhy.order.consumer.modules.order.service.*;
 import com.dxhy.order.consumer.modules.validate.service.ValidateOrderInfoService;
 import com.dxhy.order.consumer.openapi.service.CommonInterfaceService;

order-management-consumer/src/main/resources/bootstrap.yaml

@@ -40,8 +40,8 @@ sims:
     #订单数据库类型区分,要么mysql,要么Oracle,要么weblogic
     db: mysql
     #订单redis数据库类型区分,要么redis,要么redis-sentinel
-#    redisDb: redis-sentinel
-    redisDb: redis
+    redisDb: redis-sentinel
+#    redisDb: redis
 
 # 0 mysql 1 oracle
 dataType: 0