|
|
@@ -116,38 +116,23 @@ public class OrderService extends BaseService<Order> {
|
|
|
if (listCustomer.size() > 0) {
|
|
|
throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.ISEXISTS_CUSPHONE.getMessage());
|
|
|
}
|
|
|
- // 创建客户
|
|
|
- Customer customer = new Customer();
|
|
|
- customer.setCusCode(orderVO.getCusCode());
|
|
|
- // 获取编码和主键UuId
|
|
|
+ // 创建客户,获取编码和主键UuId
|
|
|
Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.CUSTOMER.getName(), true);
|
|
|
- customer.setCusId(codeMap.get("outId").toString());
|
|
|
- customer.setCusCode(codeMap.get("outNote").toString());
|
|
|
- customer.setCusName(orderVO.getCusName());
|
|
|
- customer.setCusPhone(orderVO.getCusPhone());
|
|
|
- customer.setAddressArea(orderVO.getAddressArea());
|
|
|
- customer.setAddressName(orderVO.getAddressName());
|
|
|
- customer.setAddressNo(orderVO.getAddressNo());
|
|
|
- customer.setAddressGcj02(orderVO.getAddressGcj02());
|
|
|
- customer.setAddressFull(orderVO.getAddressFull());
|
|
|
- customer.setContactName(orderVO.getContactName());
|
|
|
- customer.setContactPhone(orderVO.getContactPhone());
|
|
|
- customer.setCusFrom(orderVO.getCusFrom());
|
|
|
- customer.setChannelId(orderVO.getSalesChannel());
|
|
|
- customer.setOrgId(orderVO.getOrgId());
|
|
|
- customer.setStaffId(orderVO.getStaffId());
|
|
|
- customer.setReportStaff(orderVO.getMakeStaff());
|
|
|
- customer.setSaleStatus("销售状态-成交");
|
|
|
- customer.setCpId(orderVO.getCpId());
|
|
|
+ Customer customer = new Customer();
|
|
|
+ customer.setCusId(codeMap.get("outId").toString()).setCusCode(codeMap.get("outNote").toString()).setCusName(orderVO.getCusName())
|
|
|
+ .setCusPhone(orderVO.getCusPhone()).setAddressArea(orderVO.getAddressArea()).setAddressName(orderVO.getAddressName())
|
|
|
+ .setAddressNo(orderVO.getAddressNo()).setAddressGcj02(orderVO.getAddressGcj02()).setAddressFull(orderVO.getAddressFull())
|
|
|
+ .setContactName(orderVO.getContactName()).setContactPhone(orderVO.getContactPhone()).setCusFrom(orderVO.getCusFrom())
|
|
|
+ .setChannelId(orderVO.getSalesChannel()).setOrgId(orderVO.getOrgId()).setStaffId(orderVO.getStaffId())
|
|
|
+ .setReportStaff(orderVO.getMakeStaff()).setSaleStatus(Constant.SaleStatus.CHENGJIAO.getName()).setCpId(orderVO.getCpId());
|
|
|
customerMapper.insert(customer);
|
|
|
orderVO.setCusId(customer.getCusId());
|
|
|
}
|
|
|
|
|
|
// 获取单号
|
|
|
Map<String , Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.ORDER.getName(),false);
|
|
|
- orderVO.setOrderId(codeMap.get("outId").toString());
|
|
|
- orderVO.setOrderNo(codeMap.get("outNote").toString());
|
|
|
- orderVO.setOrderType(Constant.DocumentType.ORDER_CHASE.getName());
|
|
|
+ orderVO.setOrderId(codeMap.get("outId").toString()).setOrderNo(codeMap.get("outNote").toString())
|
|
|
+ .setOrderType(Constant.DocumentType.ORDER_CHASE.getName());
|
|
|
// 转化实体
|
|
|
Order order = orderConvert.convertToPo(orderVO);
|
|
|
// 订单总单保存
|
|
|
@@ -185,4 +170,21 @@ public class OrderService extends BaseService<Order> {
|
|
|
return ResponseResultUtil.success(super.update(order, new UpdateWrapper<Order>().lambda().eq(Order::getOrderId,
|
|
|
UUID.fromString(order.getOrderId()))));
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @desc : 获取订单信息(编辑用)
|
|
|
+ * @author : 付斌
|
|
|
+ * @date : 2024-03-02 17:27
|
|
|
+ */
|
|
|
+ public ResponseResultVO<?> getOrderForUpdate(String orderId) {
|
|
|
+ Map<String, Object> orderInfo = null;
|
|
|
+ Order order = orderMapper.selectById(orderId);
|
|
|
+ orderInfo.put("order", order);
|
|
|
+
|
|
|
+// //新建经销商下的门店为部门
|
|
|
+// List<Store> stores = storeMapper.selectByCond(new Store().setFlgValid(true).setStoreOnly(true).setSale2Id(id));
|
|
|
+// companyInfo.put("subStoreList", stores);
|
|
|
+
|
|
|
+ return ResponseResultUtil.success(orderInfo);
|
|
|
+ }
|
|
|
}
|