|
@@ -96,6 +96,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
String saleHistoricalOrderAmount = (String) mapVal.get("saleHistoricalOrderAmount");
|
|
|
// 得到订单备注
|
|
|
String saleRemark = (String) mapVal.get("saleRemark");
|
|
|
+ // 得到是否自提
|
|
|
+ String isSelfMention = (String) mapVal.get("isSelfMention");
|
|
|
// 得到收货单位
|
|
|
String receiveUnit = (String) mapVal.get("receiveUnit");
|
|
|
BigDecimal receiveId = amsSaleOrderMapper.getReceiveId(receiveUnit);
|
|
@@ -120,7 +122,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
amsSaleOrder.setUpdateUsername("admin");
|
|
|
amsSaleOrder.setReceiveId(receiveId);
|
|
|
amsSaleOrder.setShipperId(shipperId);
|
|
|
- amsSaleOrder.setSaleOrderIsselfMention("否");
|
|
|
+ if (isSelfMention != null) {
|
|
|
+ if (isSelfMention.equals("自提")) {
|
|
|
+ amsSaleOrder.setSaleOrderIsselfMention("是");
|
|
|
+ } else {
|
|
|
+ amsSaleOrder.setSaleOrderIsselfMention("否");
|
|
|
+ }
|
|
|
+ }
|
|
|
amsSaleOrder.setSaleOrderTax("13%");
|
|
|
amsSaleOrder.setSaleUnitPrice(new BigDecimal(4000));
|
|
|
amsSaleOrder.setSaleRemark(saleRemark);
|