|
@@ -132,7 +132,6 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
|
|
|
@Override
|
|
|
public Map<String, Object> generateOrder(OrderParam orderParam) {
|
|
|
OmsOrder order = new OmsOrder();
|
|
|
- order.setPlatformType("STUDENT");
|
|
|
String orderSn = generateOrderSn();
|
|
|
if (!StringUtil.isEmpty(orderParam.getOrderNo())) {
|
|
|
// 订单号不为空
|
|
@@ -275,7 +274,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
|
|
|
order.setFreightAmount(new BigDecimal(0));
|
|
|
order.setPromotionAmount(calcPromotionAmount(orderItemList));
|
|
|
order.setPromotionInfo(getOrderPromotionInfo(orderItemList));
|
|
|
- order.setPlatformType(orderParam.getPlatformType());
|
|
|
+ order.setPlatformType(orderParam.getPlatformType() == null?"STUDENT":orderParam.getPlatformType());
|
|
|
if (StringUtil.isEmpty(orderParam.getCouponId())) {
|
|
|
order.setCouponAmount(new BigDecimal(0));
|
|
|
} else {
|