回调失败问题

This commit is contained in:
2025-12-20 09:24:26 +08:00
parent c33f169614
commit 5d53df1233

View File

@@ -137,6 +137,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
ware.setShopName(shopInfo.getShopName()); ware.setShopName(shopInfo.getShopName());
ware.setShopAddress(shopInfo.getAddress()); ware.setShopAddress(shopInfo.getAddress());
} }
ware.setShopId(shopId);
List<GbWareOrderVO> orderIngResult = new ArrayList<>(); List<GbWareOrderVO> orderIngResult = new ArrayList<>();
List<GbWareOrderVO> orderIng = listAs(query().eq(GbOrder::getWareId, wareId) List<GbWareOrderVO> orderIng = listAs(query().eq(GbOrder::getWareId, wareId)
.eq(GbOrder::getShopId, shopId) .eq(GbOrder::getShopId, shopId)
@@ -262,8 +263,10 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
record.setVerifyCode(CzgRandomUtils.randomNumber(12, true)); record.setVerifyCode(CzgRandomUtils.randomNumber(12, true));
wareService.upGbWareGroupedNum(record.getWareId(), record.getNum()); wareService.upGbWareGroupedNum(record.getWareId(), record.getNum());
GbWare ware = wareService.getById(record.getWareId()); GbWare ware = wareService.getById(record.getWareId());
if (ware == null) {
if (StrUtil.isBlank(record.getGroupOrderNo())) { log.error("拼团回调 失败商品不存在record:{}", JSONObject.toJSONString(record));
}
if (ware != null && StrUtil.isBlank(record.getGroupOrderNo())) {
GbOrder order = new GbOrder(); GbOrder order = new GbOrder();
order.setShopId(record.getShopId()); order.setShopId(record.getShopId());
String groupOrderNo = CzgRandomUtils.randomNumber(OrderNoPrefixEnum.GBO, 12, false); String groupOrderNo = CzgRandomUtils.randomNumber(OrderNoPrefixEnum.GBO, 12, false);
@@ -284,7 +287,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
order.setGroupEndTime(LocalDateTime.now().plusHours(ware.getGroupTimeoutHour())); order.setGroupEndTime(LocalDateTime.now().plusHours(ware.getGroupTimeoutHour()));
order.setCreateTime(LocalDateTime.now()); order.setCreateTime(LocalDateTime.now());
order.setStatus("ing"); order.setStatus("ing");
if (ware == null || ware.getOnlineStatus() == 0 || ware.getIsDel()) { if (ware.getOnlineStatus() == 0 || ware.getIsDel()) {
order.setStatus("fail"); order.setStatus("fail");
order.setGroupEndTime(LocalDateTime.now()); order.setGroupEndTime(LocalDateTime.now());
} else if (ware.getGroupPeopleNum() == 1) { } else if (ware.getGroupPeopleNum() == 1) {
@@ -297,7 +300,7 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
//推送 拼团成功 //推送 拼团成功
sendMessage(order.getShopId(), order.getGroupOrderNo()); sendMessage(order.getShopId(), order.getGroupOrderNo());
} }
} else { } else if(StrUtil.isNotBlank(record.getGroupOrderNo())){
GbOrder order = getOne(query().eq(GbOrder::getGroupOrderNo, record.getGroupOrderNo()) GbOrder order = getOne(query().eq(GbOrder::getGroupOrderNo, record.getGroupOrderNo())
.eq(GbOrder::getShopId, record.getShopId())); .eq(GbOrder::getShopId, record.getShopId()));
order.setCurrentPeopleNum(order.getCurrentPeopleNum() + 1); order.setCurrentPeopleNum(order.getCurrentPeopleNum() + 1);