|
|
@@ -436,8 +436,11 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
|
|
|
order.setSalerName(res.getData().get(0).getAccount());
|
|
|
}
|
|
|
}
|
|
|
+ String deptName = sysClient.getDeptName(deptId).getData();
|
|
|
order.setSalesCompanyId(deptId);
|
|
|
- order.setSalesCompanyName(sysClient.getDeptName(deptId).getData());
|
|
|
+ order.setSalesCompanyName(deptName);
|
|
|
+ order.setSharedCompanyId(String.valueOf(deptId));
|
|
|
+ order.setSharedCompanyName(deptName);
|
|
|
order.setRecAddress(address);
|
|
|
order.setContacts(corpsAttn.getCname());
|
|
|
order.setPhone(corpsAttn.getTel());
|
|
|
@@ -508,8 +511,8 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
|
|
|
order.setFreight(new BigDecimal(5));*/
|
|
|
}
|
|
|
amount = amount.add(order.getTotalMoney());
|
|
|
- order.setSharedCompanyId(shoppingCartList.get(0).getSharedCompanyId() + "");
|
|
|
- order.setSharedCompanyName(shoppingCartList.get(0).getSharedCompanyName());
|
|
|
+// order.setSharedCompanyId(shoppingCartList.get(0).getSharedCompanyId() + "");
|
|
|
+// order.setSharedCompanyName(shoppingCartList.get(0).getSharedCompanyName());
|
|
|
}
|
|
|
if (goodsName.length() > 0) {
|
|
|
order.setGoodsNameJoin(goodsName.substring(0, goodsName.length() - 1));
|