|
@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
|
public class LotOrderServiceImpl implements LotOrderService {
|
|
public class LotOrderServiceImpl implements LotOrderService {
|
|
@@ -54,7 +55,7 @@ public class LotOrderServiceImpl implements LotOrderService {
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public int createLotOrder(LotOrder lotOrder) {
|
|
public int createLotOrder(LotOrder lotOrder) {
|
|
|
UserInfo userInfo = UserUtils.getSimpleUserInfo();
|
|
UserInfo userInfo = UserUtils.getSimpleUserInfo();
|
|
|
- if (userInfo == null) {
|
|
|
|
|
|
|
+ if (userInfo == null && Objects.isNull(lotOrder.getUserId())) {
|
|
|
throw new ServiceException(500, "请先登录");
|
|
throw new ServiceException(500, "请先登录");
|
|
|
}
|
|
}
|
|
|
//判断该拍品订单是否已存在
|
|
//判断该拍品订单是否已存在
|
|
@@ -70,7 +71,7 @@ public class LotOrderServiceImpl implements LotOrderService {
|
|
|
|
|
|
|
|
lotOrder.setCreateTime(DateUtils.getNowDate());
|
|
lotOrder.setCreateTime(DateUtils.getNowDate());
|
|
|
lotOrder.setStatus(100);//待支付
|
|
lotOrder.setStatus(100);//待支付
|
|
|
- lotOrder.setUserId(userInfo.getId().longValue());
|
|
|
|
|
|
|
+ lotOrder.setUserId(Objects.isNull(userInfo) ? lotOrder.getUserId() : userInfo.getId());
|
|
|
lotOrder.setOrderNo(RandomUtil.getRandom(RandomUtil.MALL_USER_ORDER));
|
|
lotOrder.setOrderNo(RandomUtil.getRandom(RandomUtil.MALL_USER_ORDER));
|
|
|
return lotOrderMapper.insertLotOrder(lotOrder);
|
|
return lotOrderMapper.insertLotOrder(lotOrder);
|
|
|
}
|
|
}
|