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 969aac3..4837993 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 @@ -1,6 +1,7 @@ package cn.hangtag.module.oms.service.customer; import cn.hangtag.module.system.controller.admin.user.vo.user.UserSaveReqVO; +import cn.hangtag.module.system.service.permission.PermissionService; import cn.hangtag.module.system.service.user.AdminUserService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -41,6 +42,10 @@ public class CustomerServiceImpl implements CustomerService { @Resource private AdminUserService userService; + @Resource + private PermissionService permissionService; + + @Override @Transactional(rollbackFor = Exception.class) public Long createCustomer(CustomerSaveReqVO createReqVO) { @@ -55,10 +60,20 @@ public class CustomerServiceImpl implements CustomerService { userSaveReqVO.setPassword(userInitPassword); userSaveReqVO.setDeptId(999999L); // 固定为用户分类 Long userId = userService.createUser(userSaveReqVO); + + + //分配角色 + Set roleIds = new HashSet<>(); + roleIds.add(-999L); // 固定客户角色 + permissionService.assignUserRole(userId, roleIds); + customer.setUserId(userId); customerMapper.insert(customer); // 插入子表 createCustomerAddressList(customer.getId(), createReqVO.getCustomerAddresss()); + + + // 返回 return customer.getId(); } diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index..vue b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index..vue deleted file mode 100644 index 004062f..0000000 --- a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index..vue +++ /dev/null @@ -1,392 +0,0 @@ - - - - - - - diff --git a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue index d12094b..ae93e5e 100644 --- a/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue +++ b/hangtag-ui/hangtag-ui-front/src/views/oms/order/createorder/index.vue @@ -1,15 +1,15 @@ - -