|
@@ -135,7 +135,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
|
|
OmsOrder order = new OmsOrder();
|
|
OmsOrder order = new OmsOrder();
|
|
String orderSn = generateOrderSn();
|
|
String orderSn = generateOrderSn();
|
|
if (!StringUtil.isEmpty(orderParam.getOrderNo())) {
|
|
if (!StringUtil.isEmpty(orderParam.getOrderNo())) {
|
|
- // 订单号不为空 先删除订单 在重新创建订单
|
|
|
|
|
|
+ // 订单号不为空
|
|
OmsOrderDetail detail = detail(orderParam.getOrderNo());
|
|
OmsOrderDetail detail = detail(orderParam.getOrderNo());
|
|
if (detail != null && detail.getStatus() == 0) {
|
|
if (detail != null && detail.getStatus() == 0) {
|
|
// 取消原有的订单支付
|
|
// 取消原有的订单支付
|
|
@@ -158,6 +158,9 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
|
|
}
|
|
}
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
|
+ if (orderParam.getMemberReceiveAddressId() == null) {
|
|
|
|
+ throw new BizException("请选择收货地址");
|
|
|
|
+ }
|
|
if (orderParam.getOrderAmount() == null) {
|
|
if (orderParam.getOrderAmount() == null) {
|
|
throw new BizException("订单金额校验不通过");
|
|
throw new BizException("订单金额校验不通过");
|
|
}
|
|
}
|