zm/nuttyreading-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

发货相关更新

Browse Source
This commit is contained in:
wangjinlei
2023-10-31 16:29:09 +08:00
parent f037f9c2f5
commit 5a15ba417c
6 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/com/peanut/modules/book/controller/BuyOrderController.java
View File

@@ -587,18 +587,39 @@ public class BuyOrderController {
* @param expressOrderSn 运单号
* @return R
*/
@RequestMapping(value = "/queryExpress", method = RequestMethod.GET)
public R queryExpress(@RequestParam("expressOrderSn") String expressOrderSn,
@RequestParam("expressCompanyCode") String expressCompanyCode,
@RequestParam("customerName") String customerName) {
// @RequestMapping(value = "/queryExpress", method = RequestMethod.GET)
// public R queryExpress(@RequestParam("expressOrderSn") String expressOrderSn,
// @RequestParam("expressCompanyCode") String expressCompanyCode,
// @RequestParam("customerName") String customerName) {
//
// ExpressQueryResponseVo vo = new ExpressQueryResponseVo();
// ExpressQueryResponse expressQueryResponse = expressOrderService.queryExpressOrder(expressCompanyCode, expressOrderSn, customerName);
// vo.setLogisticCode(expressQueryResponse.getLogisticCode());
// vo.setTraces(expressQueryResponse.getTraces());
// return R.ok().put("result", vo);
// }
ExpressQueryResponseVo vo = new ExpressQueryResponseVo();
ExpressQueryResponse expressQueryResponse = expressOrderService.queryExpressOrder(expressCompanyCode, expressOrderSn, customerName);
vo.setLogisticCode(expressQueryResponse.getLogisticCode());
vo.setTraces(expressQueryResponse.getTraces());
return R.ok().put("result", vo);
/**
* 查询快递订单轨迹
* @param expressOrderSn
* @return
*/
@RequestMapping("/searchExpress")
public R searchExpress(@RequestParam String expressOrderSn){
LambdaQueryWrapper<ExpressOrder> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ExpressOrder::getExpressOrderSn,expressOrderSn);
ExpressOrder expressOrder = expressOrderService.getBaseMapper().selectOne(wrapper);
if(expressOrder==null){
return R.error("查询失败");
}
String tel = expressOrder.getConsigneeMobile().substring(expressOrder.getConsigneeMobile().length()-4);
ExpressQueryResponse expressQueryResponse = expressOrderService.queryExpressOrder(expressOrder.getExpressCompanyCode(), expressOrderSn, tel);
return R.ok().put("express",expressQueryResponse);
}
/**
* 检查可合并的订单信息
*