diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java index 60c13c9b2..f001691e0 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisCustomerUserMapper.java @@ -88,6 +88,8 @@ public interface EmisCustomerUserMapper extends BaseMapper public EmisCustomerUser selectEmisCustomerUserByPhone(String phone); + public EmisCustomerUser selectCustomerByCustomerCode(String customerCode); + public EmisCustomerUser selectMonthCustomerByName(String customerName); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 7bc9d1681..aa73334a9 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -2799,18 +2799,26 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 通知网点有新的订单 // 用户新下单 String userEmpCode=null; - String title="有新的运单,请接单,单号【"+emisWaybillSave.getBillCode()+"】"; + + String title="有新的运单,请接单,单号【"+emisWaybillSave.getBillCode()"】"; + if(!StringUtils.isEmpty(emisWaybillSave.getCustomerCode())) { + EmisCustomerUser emisCustomerUser = emisCustomerUserMapper.selectEmisCustomerUserByPhone(emisWaybillSave.getCustomerCode()); + if(emisCustomerUser!=null) { + title = +title + " 客户昵称:" + emisCustomerUser.getNickName() + " 手机号:" + emisCustomerUser.getPhone(); + } + } if("1".equals(emisWaybillSave.getPickupMethod())){ userEmpCode=emisWaybillSave.getOperateEmployeeCode(); } else if("2".equals(emisWaybillSave.getPickupMethod())){ userEmpCode=emisWaybillSave.getTakePieceEmployeeCode(); } + if(!StringUtils.isEmpty(userEmpCode)) { - sendNoticeToEmpUser(userEmpCode, title, title, "/d24/orderManagement/UserOrderList"); + sendNoticeToEmpUser(userEmpCode, title, title, "/d24/orderManagement/UserOrderList?billCode="+emisWaybillSave.getBillCode()); } else{ - sendNoticeToSite(emisWaybillSave.getSendSiteCode(), title, title, "/d24/orderManagement/UserOrderList"); + sendNoticeToSite(emisWaybillSave.getSendSiteCode(), title, title, "/d24/orderManagement/UserOrderList?billCode="+emisWaybillSave.getBillCode()); } } diff --git a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml index b7f5e0536..f6cd75a79 100644 --- a/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml @@ -426,6 +426,12 @@ where a.phone = #{phone} + +