Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
@@ -115,9 +115,6 @@ public class GbOrderServiceImpl extends ServiceImpl<GbOrderMapper, GbOrder> impl
|
|||||||
} else {
|
} else {
|
||||||
gbOrderDetail = mapper.getDetailByGroupNo(mainIdByShopId, shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong());
|
gbOrderDetail = mapper.getDetailByGroupNo(mainIdByShopId, shopId, groupOrderNo, StpKit.USER.getLoginIdAsLong());
|
||||||
gbOrderDetail.setGroupOrderNo(groupOrderNo);
|
gbOrderDetail.setGroupOrderNo(groupOrderNo);
|
||||||
if (!"ing".equals(gbOrderDetail.getWareGroupStatus())) {
|
|
||||||
throw new CzgException("拼团已结束");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
List<GbOrderUserVO> users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo());
|
List<GbOrderUserVO> users = mapper.getGbOrderDetailUsers(mainIdByShopId, shopId, gbOrderDetail.getGroupOrderNo());
|
||||||
gbOrderDetail.setUsers(users);
|
gbOrderDetail.setUsers(users);
|
||||||
|
|||||||
Reference in New Issue
Block a user