发货相关更新

src/main/java/com/peanut/config/Constants.java

@@ -81,7 +81,7 @@ public class Constants {
     /**
      * 快递接口指令-下单
      */
-    public static final String EXPRESS_REQUEST_TYPE_QUERY = "1002";
+    public static final String EXPRESS_REQUEST_TYPE_QUERY = "8001";//"1002";
     /**
      * 快递接口 - 下单 URL
      */

src/main/java/com/peanut/modules/book/controller/BuyOrderController.java

@@ -587,17 +587,38 @@ 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);
+    }
+
+
+
 
     /**
      * 检查可合并的订单信息

src/main/java/com/peanut/modules/book/controller/ExpressController.java

@@ -58,7 +58,7 @@ public class ExpressController {
     @RequestMapping("/getExpressPrints")
     public R getExpressPrints(@RequestBody ExpressPrintDto expressPrintDto) throws IOException {
         LambdaQueryWrapper<ExpressOrder> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(StringUtils.isBlank(expressPrintDto.getExpressOrderSn()),ExpressOrder::getExpressOrderSn,expressPrintDto.getExpressOrderSn());
+        wrapper.eq(StringUtils.isNotBlank(expressPrintDto.getExpressOrderSn()),ExpressOrder::getExpressOrderSn,expressPrintDto.getExpressOrderSn());
         if(expressPrintDto.getDate()!=null&&expressPrintDto.getDate()!=""){
             String startDate = expressPrintDto.getDate()+" 00:00:00";
             String endDate = expressPrintDto.getDate()+" 23:59:59";

src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java

@@ -423,6 +423,11 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
 
         QueryWrapper<County> countyQueryWrapper = new QueryWrapper<>();
         countyQueryWrapper.eq("county_name", buyOrder.getDistrict());
+        List<County> counties = countyService.getBaseMapper().selectList(countyQueryWrapper);
+        if(counties.size()>1){
+            City one = cityService.getOne(new LambdaQueryWrapper<City>().eq(City::getCityName, buyOrder.getCity()));
+            countyQueryWrapper.eq("city_id",one.getCityId());
+        }
         County county = countyService.getOne(countyQueryWrapper);
 
 
@@ -616,8 +621,15 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
         }
         responseVo.setGoodsList(goodsResponseVoList);
 
-
-
+        //查询快递包裹
+        LambdaQueryWrapper<BuyOrderProduct> b_wrapper = new LambdaQueryWrapper<>();
+        b_wrapper.eq(BuyOrderProduct::getOrderId,buyOrder.getOrderId());
+        b_wrapper.gt(BuyOrderProduct::getExpressOrderId,0);
+        List<Integer> collect = buyOrderProductService.getBaseMapper().selectList(b_wrapper).stream().map(BuyOrderProduct::getExpressOrderId).collect(Collectors.toList());
+        if(collect.size()>0){
+            List<ExpressOrder> expressOrders = expressOrderService.getBaseMapper().selectList(new LambdaQueryWrapper<ExpressOrder>().in(ExpressOrder::getId, collect));
+            responseVo.setExpressOrders(expressOrders);
+        }
 
         return responseVo;
     }

src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java

@@ -392,8 +392,7 @@ public class MyUserServiceImpl extends ServiceImpl<MyUserDao, MyUserEntity> impl
     }
 
 
-
-    private void sendCode(String phone,String code) throws Exception {
+    private void sendCode(String phone, String code) throws Exception {
         com.aliyun.dysmsapi20170525.Client client = Sample.createClient(smsConfig.getAccessKeyId(),smsConfig.getAccessKeySecret());
         SendSmsRequest sendSmsRequest = new SendSmsRequest()
                 .setSignName(smsConfig.getSingName())

src/main/java/com/peanut/modules/book/vo/response/BuyOrderResponseVo.java

@@ -1,5 +1,6 @@
 package com.peanut.modules.book.vo.response;
 
+import com.peanut.modules.book.entity.ExpressOrder;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -81,4 +82,8 @@ public class BuyOrderResponseVo {
      * 发货时间
      */
     private Date shippingTime;
+    /**
+     * 快递包裹
+     */
+    private List<ExpressOrder> expressOrders;
 }