Commit 0199ee8d authored by shiyu's avatar shiyu

商品详情

parent 6228305b
...@@ -372,16 +372,18 @@ public class SupplierItemServiceImpl implements SupplierItemService { ...@@ -372,16 +372,18 @@ public class SupplierItemServiceImpl implements SupplierItemService {
if (auctionConfig.getIsValid()) { if (auctionConfig.getIsValid()) {
auctionConfigDao.setEnd(itemId); auctionConfigDao.setEnd(itemId);
} }
//如果是该用户竞拍成功,还没生成订单则用户状态为立即支付 if (lastedRecord != null) {
if (lastedRecord.getUserId().longValue() == dto.getUserId().longValue()) { //如果是该用户竞拍成功,还没生成订单则用户状态为立即支付
//竞拍结束后未生成订单 if (lastedRecord.getUserId().longValue() == dto.getUserId().longValue()) {
if (distributionOrder == null || distributionOrder.getPayTime() == null) { //竞拍结束后未生成订单
auctionDetailVo.setUserState(DistributionEnum.AuctionUserStateEnum.PRE_PAY.getCode()); if (distributionOrder == null || distributionOrder.getPayTime() == null) {
auctionDetailVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.PRE_PAY.getDes()); auctionDetailVo.setUserState(DistributionEnum.AuctionUserStateEnum.PRE_PAY.getCode());
} else { auctionDetailVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.PRE_PAY.getDes());
//竞拍结束页生成了订单并支付过了就显示竞拍结束 } else {
auctionDetailVo.setUserState(DistributionEnum.AuctionUserStateEnum.END.getCode()); //竞拍结束页生成了订单并支付过了就显示竞拍结束
auctionDetailVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.END.getDes()); auctionDetailVo.setUserState(DistributionEnum.AuctionUserStateEnum.END.getCode());
auctionDetailVo.setUserStateName(DistributionEnum.AuctionUserStateEnum.END.getDes());
}
} }
} }
} else { } else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment