|
|
@@ -169,6 +169,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
|
|
|
List<PjOrder> pjOrderList = new ArrayList<>();
|
|
|
// 处理部门,取第一个
|
|
|
Long deptId = UserUtils.getUserFirstDeptId(bladeUser.getDeptId());
|
|
|
+ String deptName = sysClient.getDeptName(deptId).getData();
|
|
|
// 获取业务员,不存在就远程查找
|
|
|
if (ObjectUtils.isNull(finalCorpsDesc.getSalesmanId())) {
|
|
|
R<List<User>> res = userSearchClient.getWarehouseKeeper("业务员", bladeUser.getDeptId());
|
|
|
@@ -187,7 +188,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
|
|
|
String jsonStr = JSON.toJSONString(map.get("list"));
|
|
|
JSONArray objects = JSONArray.parseArray(jsonStr);
|
|
|
List<PjShoppingCart> shoppingCartList = objects.toJavaList(PjShoppingCart.class);
|
|
|
- PjOrder order = WxParamUtil.getBaseOrderByCorps(finalCorpsDesc, corpsAttn, bladeUser, nowOrderNo, billNo, deptId, finalCorpsDesc.getCname(), address);
|
|
|
+ PjOrder order = WxParamUtil.getBaseOrderByCorps(finalCorpsDesc, corpsAttn, bladeUser, nowOrderNo, billNo, deptId, deptName, address);
|
|
|
order.setBsType(OrderTypeEnum.SALES.getType());
|
|
|
order.setBusinessSource(OrderTypeEnum.XCX.getType());
|
|
|
order.setReceivableType("网络支付");
|