|
@@ -161,7 +161,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
|
|
|
OrderInfo orderInfo = new OrderInfo();
|
|
|
orderInfo.setId(IdWorker.getId());
|
|
|
orderInfo.setSource(2);
|
|
|
- orderInfo.setTaxRate(new BigDecimal("10.00"));
|
|
|
+ orderInfo.setTaxRate(BigDecimal.TEN);
|
|
|
orderInfo.setTag("0");
|
|
|
orderInfo.setSettlementStatus(1);
|
|
|
orderInfo.setType(1);
|
|
@@ -194,18 +194,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
|
|
|
orderInfo.setPackingLabor(BigDecimal.ZERO);
|
|
|
orderInfo.setManagementFee(BigDecimal.ZERO);
|
|
|
orderInfo.setPackagingMaterialCost(BigDecimal.ZERO);
|
|
|
-
|
|
|
- // 赋值订单异常类型
|
|
|
orderInfo.setExceptionType(OrderExceptionTypeEnum.NORMAL.getKey().toString());
|
|
|
- if (orderInfo.getWlnStatus() == 10) {
|
|
|
- addExceptionType(orderInfo, OrderExceptionTypeEnum.ORDER_CLOSURE);
|
|
|
- }
|
|
|
- if (orderInfo.getWlnStatus() == 11) {
|
|
|
- addExceptionType(orderInfo, OrderExceptionTypeEnum.ORDER_ABORT);
|
|
|
- }
|
|
|
- if (orderInfo.getWlnStatus() == 12) {
|
|
|
- addExceptionType(orderInfo, OrderExceptionTypeEnum.ORDER_EXCEPTION_HANDLING);
|
|
|
- }
|
|
|
|
|
|
// 事业部id
|
|
|
Department department = context.getDepartment();
|
|
@@ -222,6 +211,17 @@ public class WlnOrderServiceImpl implements WlnOrderService {
|
|
|
orderInfo.setStatus(OrderStatusEnum.UNDER_REVIEW.getKey());
|
|
|
}
|
|
|
|
|
|
+ // 赋值订单异常类型
|
|
|
+ if (orderInfo.getWlnStatus() == 10) {
|
|
|
+ addExceptionType(orderInfo, OrderExceptionTypeEnum.ORDER_CLOSURE);
|
|
|
+ }
|
|
|
+ if (orderInfo.getWlnStatus() == 11) {
|
|
|
+ addExceptionType(orderInfo, OrderExceptionTypeEnum.ORDER_ABORT);
|
|
|
+ }
|
|
|
+ if (orderInfo.getWlnStatus() == 12) {
|
|
|
+ addExceptionType(orderInfo, OrderExceptionTypeEnum.ORDER_EXCEPTION_HANDLING);
|
|
|
+ }
|
|
|
+
|
|
|
return orderInfo;
|
|
|
}
|
|
|
|