diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/front/vo/CustomerInfoVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/front/vo/CustomerInfoVO.java index f2c2e09..cbad115 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/front/vo/CustomerInfoVO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/front/vo/CustomerInfoVO.java @@ -41,6 +41,12 @@ public class CustomerInfoVO implements Serializable { * 联系人 */ private String contacts; + + /** + * 联系人邮箱 + */ + private String contactEmails; + /** * 联系人手机号 */ diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/vo/CustomerRespVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/vo/CustomerRespVO.java index c4668d3..6a4c3aa 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/vo/CustomerRespVO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/vo/CustomerRespVO.java @@ -42,6 +42,13 @@ public class CustomerRespVO { @ExcelProperty("邮箱") private String email; + /** + * 联系人 邮箱多个 ; 号连接 + */ + @Schema(description = "联系邮箱") + @ExcelProperty("联系邮箱") + private String contactEmails; + @Schema(description = "联系人") @ExcelProperty("联系人") private String contacts; diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/vo/CustomerSaveReqVO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/vo/CustomerSaveReqVO.java index 8be19ab..ef30c0a 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/vo/CustomerSaveReqVO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/controller/admin/customer/vo/CustomerSaveReqVO.java @@ -30,6 +30,9 @@ public class CustomerSaveReqVO { @Schema(description = "邮箱") private String email; + @Schema(description = "联系邮箱 多个;连接") + private String contactEmails; + @Schema(description = "联系人") private String contacts; diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/customer/CustomerDO.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/customer/CustomerDO.java index a0019e6..12297bc 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/customer/CustomerDO.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/dal/dataobject/customer/CustomerDO.java @@ -51,6 +51,10 @@ public class CustomerDO extends BaseDO { * 邮箱 */ private String email; + /** + * 联系人 邮箱多个 ; 号连接 + */ + private String contactEmails; /** * 联系人 */ diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/customer/CustomerServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/customer/CustomerServiceImpl.java index 8b5f5d6..1cebd73 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/customer/CustomerServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/customer/CustomerServiceImpl.java @@ -80,6 +80,9 @@ public class CustomerServiceImpl implements CustomerService { if(user!=null){ throw exception(CUSTOMER_EMAIL_EXISTS); } + if(FuncUtil.isEmpty(createReqVO.getContactEmails())){ + customer.setContactEmails(createReqVO.getEmail()); + } //新增用户账号 UserSaveReqVO userSaveReqVO = new UserSaveReqVO(); @@ -116,7 +119,9 @@ public class CustomerServiceImpl implements CustomerService { }else { updateReqVO.setNumber(customerDO.getNumber()); } - + if(FuncUtil.isEmpty(updateReqVO.getContactEmails())){ + updateReqVO.setContactEmails(updateReqVO.getEmail()); + } // 更新 CustomerDO updateObj = BeanUtils.toBean(updateReqVO, CustomerDO.class); customerMapper.updateById(updateObj); diff --git a/hangtag-ui/hangtag-ui-admin/src/api/oms/customer/index.ts b/hangtag-ui/hangtag-ui-admin/src/api/oms/customer/index.ts index 323295f..d321d6c 100644 --- a/hangtag-ui/hangtag-ui-admin/src/api/oms/customer/index.ts +++ b/hangtag-ui/hangtag-ui-admin/src/api/oms/customer/index.ts @@ -17,6 +17,8 @@ export interface CustomerVO { areaName?: string // 所在地名称 type: string // 类型 remarks: string // 备注 + customerAddresss: string // 客户地址 + contactEmails: string // 联系人 邮箱多个 ;号连接 } // 客户 API diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue index fbbb6ef..6a70591 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/customer/CustomerForm.vue @@ -1,5 +1,5 @@