aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-05-23 01:24:06 +08:00
parent d799e7b9a2
commit b464767688
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
View File

@ -16,7 +16,10 @@ import javax.servlet.http.HttpServletResponse;
import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter;
import com.xdadan.erp.emis.domain.EmisDestination; import com.xdadan.erp.emis.domain.EmisDestination;
import com.xdadan.erp.emis.domain.exception.EmisBizError;
import com.xdadan.erp.emis.service.EmisBaseService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
@ -51,6 +54,11 @@ public class EmisCustomerUserController extends BaseController
@Autowired @Autowired
private IEmisCustomerUserService emisCustomerUserService; private IEmisCustomerUserService emisCustomerUserService;
@Autowired
private EmisBaseService emisBaseService;
/** /**
* 查询快递客户用户列表 * 查询快递客户用户列表
*/ */
@ -115,8 +123,18 @@ public class EmisCustomerUserController extends BaseController
@PostMapping @PostMapping
public AjaxResult add(@RequestBody EmisCustomerUser emisCustomerUser) public AjaxResult add(@RequestBody EmisCustomerUser emisCustomerUser)
{ {
// emisCustomerUser.setOwnerSite(getLoginUser().getUser().getOwnerSiteCode()); try {
return toAjax(emisCustomerUserService.insertEmisCustomerUser(emisCustomerUser)); EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone());
if(oldUser!=null){
return AjaxResult.error("该客户电话号码已被占用，请使用新号码");
}
return toAjax(emisCustomerUserService.insertEmisCustomerUser(emisCustomerUser));
} catch (DuplicateKeyException e) {
e.printStackTrace();
return AjaxResult.error("数据重复!");
}
} }
/** /**
@ -127,7 +145,16 @@ public class EmisCustomerUserController extends BaseController
@PutMapping @PutMapping
public AjaxResult edit(@RequestBody EmisCustomerUser emisCustomerUser) public AjaxResult edit(@RequestBody EmisCustomerUser emisCustomerUser)
{ {
return toAjax(emisCustomerUserService.updateEmisCustomerUser(emisCustomerUser)); try {
// EmisCustomerUser oldUser=emisBaseService.getCustomerUserByPhone(emisCustomerUser.getPhone());
// if(oldUser!=null){
// return AjaxResult.error("该客户电话号码已被占用，请使用新号码");
// }
return toAjax(emisCustomerUserService.updateEmisCustomerUser(emisCustomerUser));
} catch (DuplicateKeyException e) {
e.printStackTrace();
return AjaxResult.error("数据重复!");
}
} }
/** /**

1
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisCustomerUserServiceImpl.java
View File

@ -65,7 +65,6 @@ public class EmisCustomerUserServiceImpl extends EmisBaseService implements IEmi
public int insertEmisCustomerUser(EmisCustomerUser emisCustomerUser) public int insertEmisCustomerUser(EmisCustomerUser emisCustomerUser)
{ {
EmisCustomerUser crtUser=createCustomerUser(emisCustomerUser); EmisCustomerUser crtUser=createCustomerUser(emisCustomerUser);
// return emisCustomerUserMapper.insertEmisCustomerUser(emisCustomerUser); // return emisCustomerUserMapper.insertEmisCustomerUser(emisCustomerUser);
return 1; return 1;