caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!301 fix & improve

Browse Source 
Merge pull request !301 from OceansDeep/pg
This commit is contained in:
OceansDeep 2023-08-03 08:18:06 +00:00 committed by Gitee
commit 29e6637399
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java
View File

@ -58,7 +58,7 @@ public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent,
OrderDetailVO orderDetailVO = orderService.queryDetail(orderMessage.getOrderSn());
NoticeMessageDTO noticeMessageDTO = new NoticeMessageDTO();
//如果订单状态不为空
if (orderDetailVO != null) {
if (orderDetailVO != null && orderDetailVO.getOrderItems() != null && !orderDetailVO.getOrderItems().isEmpty()) {
Map<String, String> params = new HashMap<>(2);
switch (orderMessage.getNewStatus()) {
//如果订单新的状态为已取消 则发送取消订单站内信

2
framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java
View File

@ -92,6 +92,7 @@ public class CustomWordsServiceImpl extends ServiceImpl<CustomWordsMapper, Custo
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean deleteBathByName(List<String> names) {
LambdaQueryWrapper<CustomWords> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(CustomWords::getName, names);
@ -99,6 +100,7 @@ public class CustomWordsServiceImpl extends ServiceImpl<CustomWordsMapper, Custo
}
@Override
@Transactional(rollbackFor = Exception.class)
public long insertBatchCustomWords(List<CustomWords> customWordsList) {
return this.baseMapper.insertBatchSomeColumn(customWordsList);
}

4
framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java
View File

@ -455,10 +455,8 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements
this.client.bulkAsync(request, RequestOptions.DEFAULT, new ActionListener<BulkResponse>() {
@Override
public void onResponse(BulkResponse bulkItemResponses) {
// 判断索引如果不存在的处理
log.info("批量更新商品索引结果：{}", bulkItemResponses.buildFailureMessage());
if (bulkItemResponses.hasFailures() && bulkItemResponses.getItems().length > 0) {
throw new RetryException("批量更新商品索引失败，" + bulkItemResponses.buildFailureMessage());
}
}
@Override