Merge remote-tracking branch 'origin/test' into test
# Conflicts: # src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProduct.java # src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java # src/main/java/com/chaozhanggui/system/cashierservice/service/PayService.java # src/main/java/com/chaozhanggui/system/cashierservice/service/ProductService.java # src/main/resources/mapper/TbProductMapper.xml
This commit is contained in:
@@ -108,7 +108,7 @@ public class ConsMsgConsumer {
|
||||
return;
|
||||
}
|
||||
|
||||
TbProductWithBLOBs product = tbProductMapper.selectByPrimaryKey(Integer.valueOf(skuWithBLOBs.getProductId()));
|
||||
TbProduct product = tbProductMapper.selectByPrimaryKey(Integer.valueOf(skuWithBLOBs.getProductId()));
|
||||
if (Objects.isNull(product)) {
|
||||
log.info("商品信息不存在");
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user