|
|
@ -27,7 +27,7 @@ import java.util.Map; |
|
|
* @Description: 收发货地址簿接口 |
|
|
* @Description: 收发货地址簿接口 |
|
|
*/ |
|
|
*/ |
|
|
@Service |
|
|
@Service |
|
|
public class LogisticsAddressBookServiceImpl extends ServiceImpl<LogisticsAddressBookMapper, LogisticsAddressBook>implements LogisticsAddressBookService { |
|
|
public class LogisticsAddressBookServiceImpl extends ServiceImpl<LogisticsAddressBookMapper, LogisticsAddressBook> implements LogisticsAddressBookService { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
@Autowired |
|
|
@ -45,81 +45,74 @@ public class LogisticsAddressBookServiceImpl extends ServiceImpl<LogisticsAddres |
|
|
final List<LogisticsAddressBook> list = new ArrayList<>(); |
|
|
final List<LogisticsAddressBook> list = new ArrayList<>(); |
|
|
|
|
|
|
|
|
//根据名称、电话、地址查询看是不是存在，如果不存在则新建一条
|
|
|
//根据名称、电话、地址查询看是不是存在，如果不存在则新建一条
|
|
|
if(StringUtils.isEmpty(logisticsOrder.getShipperId())){ |
|
|
if (StringUtils.isEmpty(logisticsOrder.getShipperId())) { |
|
|
// 查询，然后判断新增
|
|
|
// 创建发货人地址簿
|
|
|
final LambdaQueryWrapper<LogisticsAddressBook> stuQuery = new LambdaQueryWrapper<>(); |
|
|
final LogisticsAddressBook shipperAddressBook = new LogisticsAddressBook(); |
|
|
stuQuery.eq(LogisticsAddressBook::getShipperOrReceiverName, logisticsOrder.getShipperName()) |
|
|
// 设置发货人名称，从物流订单的发货人名称中获取
|
|
|
.eq(LogisticsAddressBook::getAddressType, 1) |
|
|
shipperAddressBook.setShipperOrReceiverName(logisticsOrder.getShipperName()); |
|
|
.eq(LogisticsAddressBook::getMobile, logisticsOrder.getShipperMobile()) |
|
|
// 设置地址信息，从物流订单的发货人地址获取
|
|
|
.eq(LogisticsAddressBook::getAddressInfo, logisticsOrder.getShipperAddress()); |
|
|
shipperAddressBook.setAddressInfo(logisticsOrder.getShipperAddress()); |
|
|
final Long count = getBaseMapper().selectCount(stuQuery); |
|
|
// 设置地址类型，1表示发货人地址
|
|
|
|
|
|
shipperAddressBook.setAddressType(1); |
|
|
if(count == 0){ |
|
|
// 设置公司ID，从物流订单中获取
|
|
|
// 创建发货人地址簿
|
|
|
shipperAddressBook.setCompanyId(logisticsOrder.getCompanyId()); |
|
|
final LogisticsAddressBook shipperAddressBook = new LogisticsAddressBook(); |
|
|
// 设置公司名称，从物流订单中获取
|
|
|
// 设置发货人名称，从物流订单的发货人名称中获取
|
|
|
shipperAddressBook.setCompanyName(logisticsOrder.getCompanyName()); |
|
|
shipperAddressBook.setShipperOrReceiverName(logisticsOrder.getShipperName()); |
|
|
// 设置创建人，从物流订单中获取
|
|
|
// 设置地址信息，从物流订单的发货人地址获取
|
|
|
shipperAddressBook.setCreateBy(logisticsOrder.getCreateBy()); |
|
|
shipperAddressBook.setAddressInfo(logisticsOrder.getShipperAddress()); |
|
|
// 设置联系电话，从物流订单的发货人手机信息中获取
|
|
|
// 设置地址类型，1表示发货人地址
|
|
|
shipperAddressBook.setMobile(logisticsOrder.getShipperMobile()); |
|
|
shipperAddressBook.setAddressType(1); |
|
|
list.add(shipperAddressBook); |
|
|
// 设置公司ID，从物流订单中获取
|
|
|
// 回填新增的发货人id
|
|
|
shipperAddressBook.setCompanyId(logisticsOrder.getCompanyId()); |
|
|
logisticsOrder.setShipperId(shipperAddressBook.getId()); |
|
|
// 设置公司名称，从物流订单中获取
|
|
|
} else { |
|
|
shipperAddressBook.setCompanyName(logisticsOrder.getCompanyName()); |
|
|
|
|
|
// 设置创建人，从物流订单中获取
|
|
|
|
|
|
shipperAddressBook.setCreateBy(logisticsOrder.getCreateBy()); |
|
|
|
|
|
// 设置联系电话，从物流订单的发货人手机信息中获取
|
|
|
|
|
|
shipperAddressBook.setMobile(logisticsOrder.getShipperMobile()); |
|
|
|
|
|
// 设置收发货人名称，从物流订单的发货人名称中获取
|
|
|
|
|
|
shipperAddressBook.setShipperOrReceiverName(logisticsOrder.getShipperName()); |
|
|
|
|
|
list.add(shipperAddressBook); |
|
|
|
|
|
} |
|
|
|
|
|
}else{ |
|
|
|
|
|
// 有id,查询，并更新名称
|
|
|
// 有id,查询，并更新名称
|
|
|
final LogisticsAddressBook oldLogisticsAddressBook = logisticsAddressBookMapper.selectById(logisticsOrder.getShipperId()); |
|
|
final LogisticsAddressBook oldLogisticsAddressBook = logisticsAddressBookMapper.selectById(logisticsOrder.getShipperId()); |
|
|
oldLogisticsAddressBook.setShipperOrReceiverName(logisticsOrder.getShipperName()); |
|
|
oldLogisticsAddressBook.setShipperOrReceiverName(logisticsOrder.getShipperName()); |
|
|
|
|
|
// 地址
|
|
|
|
|
|
oldLogisticsAddressBook.setAddressInfo(logisticsOrder.getShipperAddress()); |
|
|
|
|
|
// 电话
|
|
|
|
|
|
oldLogisticsAddressBook.setMobile(logisticsOrder.getShipperMobile()); |
|
|
list.add(oldLogisticsAddressBook); |
|
|
list.add(oldLogisticsAddressBook); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if(StringUtils.isEmpty(logisticsOrder.getReceiverId())){ |
|
|
if (StringUtils.isEmpty(logisticsOrder.getReceiverId())) { |
|
|
final LambdaQueryWrapper<LogisticsAddressBook> stuQuery2 = new LambdaQueryWrapper<>(); |
|
|
// 创建收货人地址簿
|
|
|
stuQuery2.eq(LogisticsAddressBook::getShipperOrReceiverName, logisticsOrder.getReceiverName()) |
|
|
final LogisticsAddressBook reciverAddressBook = new LogisticsAddressBook(); |
|
|
.eq(LogisticsAddressBook::getAddressType, 2) |
|
|
// 设置收货人名称，从物流订单的收货人名称中获取
|
|
|
.eq(LogisticsAddressBook::getMobile, logisticsOrder.getReceiverMobile()) |
|
|
reciverAddressBook.setShipperOrReceiverName(logisticsOrder.getReceiverName()); |
|
|
.eq(LogisticsAddressBook::getAddressInfo, logisticsOrder.getReceiverAddress()); |
|
|
// 设置地址信息，从物流订单的发货人地址获取
|
|
|
final Long count2 = getBaseMapper().selectCount(stuQuery2); |
|
|
reciverAddressBook.setAddressInfo(logisticsOrder.getReceiverAddress()); |
|
|
|
|
|
// 设置地址类型，1表示发货人地址
|
|
|
if(count2 == 0 && StringUtils.isEmpty(logisticsOrder.getReceiverId())) { |
|
|
reciverAddressBook.setAddressType(2); |
|
|
// 创建收货人地址簿
|
|
|
// 设置公司ID，从物流订单中获取
|
|
|
final LogisticsAddressBook reciverAddressBook = new LogisticsAddressBook(); |
|
|
reciverAddressBook.setCompanyId(logisticsOrder.getCompanyId()); |
|
|
// 设置收货人名称，从物流订单的收货人名称中获取
|
|
|
// 设置公司名称，从物流订单中获取
|
|
|
reciverAddressBook.setShipperOrReceiverName(logisticsOrder.getReceiverName()); |
|
|
reciverAddressBook.setCompanyName(logisticsOrder.getCompanyName()); |
|
|
// 设置地址信息，从物流订单的发货人地址获取
|
|
|
// 设置创建人，从物流订单中获取
|
|
|
reciverAddressBook.setAddressInfo(logisticsOrder.getReceiverAddress()); |
|
|
reciverAddressBook.setCreateBy(logisticsOrder.getCreateBy()); |
|
|
// 设置地址类型，1表示发货人地址
|
|
|
// 设置联系电话，从物流订单的发货人手机信息中获取
|
|
|
reciverAddressBook.setAddressType(2); |
|
|
reciverAddressBook.setMobile(logisticsOrder.getReceiverMobile()); |
|
|
// 设置公司ID，从物流订单中获取
|
|
|
list.add(reciverAddressBook); |
|
|
reciverAddressBook.setCompanyId(logisticsOrder.getCompanyId()); |
|
|
|
|
|
// 设置公司名称，从物流订单中获取
|
|
|
// 回填新增的收货人id
|
|
|
reciverAddressBook.setCompanyName(logisticsOrder.getCompanyName()); |
|
|
logisticsOrder.setReceiverId(reciverAddressBook.getId()); |
|
|
// 设置创建人，从物流订单中获取
|
|
|
} else { |
|
|
reciverAddressBook.setCreateBy(logisticsOrder.getCreateBy()); |
|
|
|
|
|
// 设置联系电话，从物流订单的发货人手机信息中获取
|
|
|
|
|
|
reciverAddressBook.setMobile(logisticsOrder.getReceiverMobile()); |
|
|
|
|
|
list.add(reciverAddressBook); |
|
|
|
|
|
} |
|
|
|
|
|
}else{ |
|
|
|
|
|
// 有id,查询，并更新名称
|
|
|
// 有id,查询，并更新名称
|
|
|
final LogisticsAddressBook oldLogisticsAddressBook = logisticsAddressBookMapper.selectById(logisticsOrder.getReceiverId()); |
|
|
final LogisticsAddressBook oldLogisticsAddressBook = logisticsAddressBookMapper.selectById(logisticsOrder.getReceiverId()); |
|
|
oldLogisticsAddressBook.setShipperOrReceiverName(logisticsOrder.getShipperName()); |
|
|
// 名称
|
|
|
|
|
|
oldLogisticsAddressBook.setShipperOrReceiverName(logisticsOrder.getReceiverName()); |
|
|
|
|
|
// 地址
|
|
|
|
|
|
oldLogisticsAddressBook.setAddressInfo(logisticsOrder.getReceiverAddress()); |
|
|
|
|
|
// 电话
|
|
|
|
|
|
oldLogisticsAddressBook.setMobile(logisticsOrder.getReceiverMobile()); |
|
|
list.add(oldLogisticsAddressBook); |
|
|
list.add(oldLogisticsAddressBook); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 调用save方法保存地址簿信息，返回保存结果
|
|
|
// 调用save方法保存地址簿信息，返回保存结果
|
|
|
final Gson gson = new Gson(); |
|
|
final Gson gson = new Gson(); |
|
|
System.out.println(gson.toJson(list)); |
|
|
System.out.println(gson.toJson(list)); |
|
|
if(list.isEmpty()){ |
|
|
if (list.isEmpty()) { |
|
|
return true; |
|
|
return true; |
|
|
} |
|
|
} |
|
|
return saveOrUpdateBatch(list); |
|
|
return saveOrUpdateBatch(list); |
|
|
@ -129,42 +122,46 @@ public class LogisticsAddressBookServiceImpl extends ServiceImpl<LogisticsAddres |
|
|
public IPage<LogisticsAddressBook> getLogisticsAddressBookPageList(LogisticsAddressBookQueryVo logisticsAddressBookQueryVo) { |
|
|
public IPage<LogisticsAddressBook> getLogisticsAddressBookPageList(LogisticsAddressBookQueryVo logisticsAddressBookQueryVo) { |
|
|
final Page<LogisticsAddressBook> page = new Page<>(); |
|
|
final Page<LogisticsAddressBook> page = new Page<>(); |
|
|
final LambdaQueryWrapper<LogisticsAddressBook> wrapper = new LambdaQueryWrapper<>(); |
|
|
final LambdaQueryWrapper<LogisticsAddressBook> wrapper = new LambdaQueryWrapper<>(); |
|
|
if(logisticsAddressBookQueryVo != null && StringUtils.isNotEmpty(logisticsAddressBookQueryVo.getKeyWord())){ |
|
|
if (logisticsAddressBookQueryVo != null && StringUtils.isNotEmpty(logisticsAddressBookQueryVo.getKeyWord())) { |
|
|
wrapper.like(LogisticsAddressBook::getShipperOrReceiverName, logisticsAddressBookQueryVo.getKeyWord()).or() |
|
|
wrapper.like(LogisticsAddressBook::getShipperOrReceiverName, logisticsAddressBookQueryVo.getKeyWord()).or() |
|
|
.like(LogisticsAddressBook::getMobile, logisticsAddressBookQueryVo.getKeyWord()); |
|
|
.like(LogisticsAddressBook::getMobile, logisticsAddressBookQueryVo.getKeyWord()); |
|
|
} |
|
|
} |
|
|
if(logisticsAddressBookQueryVo != null && logisticsAddressBookQueryVo.getAddressType() !=null ){ |
|
|
if (logisticsAddressBookQueryVo != null && logisticsAddressBookQueryVo.getAddressType() != null) { |
|
|
wrapper.eq(LogisticsAddressBook::getAddressType, logisticsAddressBookQueryVo.getAddressType()); |
|
|
wrapper.eq(LogisticsAddressBook::getAddressType, logisticsAddressBookQueryVo.getAddressType()); |
|
|
} |
|
|
} |
|
|
|
|
|
if (logisticsAddressBookQueryVo != null && logisticsAddressBookQueryVo.getCompanyId() != null) { |
|
|
|
|
|
wrapper.eq(LogisticsAddressBook::getCompanyId, logisticsAddressBookQueryVo.getCompanyId()); |
|
|
|
|
|
} |
|
|
page.setCurrent(logisticsAddressBookQueryVo.getPageNum()); |
|
|
page.setCurrent(logisticsAddressBookQueryVo.getPageNum()); |
|
|
page.setSize(logisticsAddressBookQueryVo.getPageSize()); |
|
|
page.setSize(logisticsAddressBookQueryVo.getPageSize()); |
|
|
return logisticsAddressBookMapper.selectPage(page,wrapper); |
|
|
return logisticsAddressBookMapper.selectPage(page, wrapper); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 根据名称（支持拼音模糊匹配）及手机号查询列表 |
|
|
* 根据名称（支持拼音模糊匹配）及手机号查询列表 |
|
|
* @author 王富康 |
|
|
* |
|
|
* @date 2024/10/8 |
|
|
|
|
|
* @param logisticsAddressBookQueryVo |
|
|
* @param logisticsAddressBookQueryVo |
|
|
* @return List<LogisticsAddressBook> |
|
|
* @return List<LogisticsAddressBook> |
|
|
|
|
|
* @author 王富康 |
|
|
|
|
|
* @date 2024/10/8 |
|
|
*/ |
|
|
*/ |
|
|
@Override |
|
|
@Override |
|
|
public JSONObject getLogisticsAddressBookList(LogisticsAddressBookQueryVo logisticsAddressBookQueryVo) { |
|
|
public JSONObject getLogisticsAddressBookList(LogisticsAddressBookQueryVo logisticsAddressBookQueryVo) { |
|
|
final JSONObject jsonObject = new JSONObject(); |
|
|
final JSONObject jsonObject = new JSONObject(); |
|
|
// 必须包含addressType，
|
|
|
// 必须包含addressType，
|
|
|
if(logisticsAddressBookQueryVo.getAddressType() == null){ |
|
|
if (logisticsAddressBookQueryVo.getAddressType() == null) { |
|
|
jsonObject.set("flag","0"); |
|
|
jsonObject.set("flag", "0"); |
|
|
jsonObject.set("msg","addressType参数为空"); |
|
|
jsonObject.set("msg", "addressType参数为空"); |
|
|
return jsonObject; |
|
|
return jsonObject; |
|
|
} |
|
|
} |
|
|
if(StringUtils.isEmpty(logisticsAddressBookQueryVo.getShipperOrReceiverName()) && StringUtils.isEmpty(logisticsAddressBookQueryVo.getMobile())){ |
|
|
if (StringUtils.isEmpty(logisticsAddressBookQueryVo.getShipperOrReceiverName()) && StringUtils.isEmpty(logisticsAddressBookQueryVo.getMobile())) { |
|
|
jsonObject.set("flag","0"); |
|
|
jsonObject.set("flag", "0"); |
|
|
jsonObject.set("msg","姓名及电话必须传一个！"); |
|
|
jsonObject.set("msg", "姓名及电话必须传一个！"); |
|
|
return jsonObject; |
|
|
return jsonObject; |
|
|
} |
|
|
} |
|
|
final List<LogisticsAddressBook> logisticsAddressBookList = logisticsAddressBookMapper.getLogisticsAddressBookList(logisticsAddressBookQueryVo); |
|
|
final List<LogisticsAddressBook> logisticsAddressBookList = logisticsAddressBookMapper.getLogisticsAddressBookList(logisticsAddressBookQueryVo); |
|
|
jsonObject.set("data",logisticsAddressBookList); |
|
|
jsonObject.set("data", logisticsAddressBookList); |
|
|
jsonObject.set("flag","1"); |
|
|
jsonObject.set("flag", "1"); |
|
|
return jsonObject; |
|
|
return jsonObject; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -179,8 +176,8 @@ public class LogisticsAddressBookServiceImpl extends ServiceImpl<LogisticsAddres |
|
|
.eq(LogisticsAddressBook::getMobile, logisticsOrder.getShipperMobile()) |
|
|
.eq(LogisticsAddressBook::getMobile, logisticsOrder.getShipperMobile()) |
|
|
.eq(LogisticsAddressBook::getAddressInfo, logisticsOrder.getShipperAddress()); |
|
|
.eq(LogisticsAddressBook::getAddressInfo, logisticsOrder.getShipperAddress()); |
|
|
final LogisticsAddressBook shipperLogisticsAddressBook = getBaseMapper().selectOne(stuQuery); |
|
|
final LogisticsAddressBook shipperLogisticsAddressBook = getBaseMapper().selectOne(stuQuery); |
|
|
if(shipperLogisticsAddressBook != null ){ |
|
|
if (shipperLogisticsAddressBook != null) { |
|
|
logisticsAddressBookMap.put("shipperLogisticsAddressBook",shipperLogisticsAddressBook); |
|
|
logisticsAddressBookMap.put("shipperLogisticsAddressBook", shipperLogisticsAddressBook); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 收货人
|
|
|
// 收货人
|
|
|
@ -191,8 +188,8 @@ public class LogisticsAddressBookServiceImpl extends ServiceImpl<LogisticsAddres |
|
|
.eq(LogisticsAddressBook::getAddressInfo, logisticsOrder.getReceiverAddress()); |
|
|
.eq(LogisticsAddressBook::getAddressInfo, logisticsOrder.getReceiverAddress()); |
|
|
final LogisticsAddressBook receiverLogisticsAddressBook = getBaseMapper().selectOne(stuQuery2); |
|
|
final LogisticsAddressBook receiverLogisticsAddressBook = getBaseMapper().selectOne(stuQuery2); |
|
|
|
|
|
|
|
|
if(receiverLogisticsAddressBook != null ){ |
|
|
if (receiverLogisticsAddressBook != null) { |
|
|
logisticsAddressBookMap.put("receiverLogisticsAddressBook",receiverLogisticsAddressBook); |
|
|
logisticsAddressBookMap.put("receiverLogisticsAddressBook", receiverLogisticsAddressBook); |
|
|
} |
|
|
} |
|
|
return logisticsAddressBookMap; |
|
|
return logisticsAddressBookMap; |
|
|
} |
|
|
} |
|
|
|
wangfukang
1 year ago