修改bug

src/main/java/com/esv/freight/app/common/component/RedisComponent.java

@@ -84,6 +84,7 @@ public class RedisComponent {
     @SuppressWarnings("unchecked")
     public void del(String... key) {
         if (key != null && key.length > 0) {
+            log.info("123... key length=="+key.length);
             if (key.length == 1) {
                 Boolean b = redisTemplate.delete(key[0]);
                 if(b == true) {
@@ -93,6 +94,7 @@ public class RedisComponent {
                     log.info("123... del is false");
                 }
             } else {
+                log.info("123... 11111111");
                 redisTemplate.delete(CollectionUtils.arrayToList(key));
             }
         }

src/main/java/com/esv/freight/app/common/component/TokenComponent.java

@@ -139,6 +139,10 @@ public class TokenComponent {
             throw new EException(ECode.TOKEN_INVALID.code(), ECode.TOKEN_INVALID.message());
         }
 
+        if(!accessToken.equals(tokenInfoPojo.getAccessToken())) {
+            throw new EException(ECode.TOKEN_INVALID.code(), ECode.TOKEN_INVALID.message());
+        }
+
         // 校验Token是否过期
         Long accessTokenValidTime = tokenInfoPojo.getAccessTokenValidTime();
         if (System.currentTimeMillis() > accessTokenValidTime) {
@@ -146,6 +150,31 @@ public class TokenComponent {
         }
     }
 
+    /**
+     * description 校验Token是否过期
+     * param [accessToken]
+     * return void
+     * author Administrator
+     * createTime 2020/05/14 17:37
+     **/
+    public void checkRefreshToken(String accessToken) throws EException {
+        // 获取Token信息
+        TokenInfoPojo tokenInfoPojo = this.getTokenInfo(accessToken);
+        if (null == tokenInfoPojo) {
+            throw new EException(ECode.TOKEN_INVALID.code(), ECode.TOKEN_INVALID.message());
+        }
+
+        if(!accessToken.equals(tokenInfoPojo.getAccessToken())) {
+            throw new EException(ECode.TOKEN_INVALID.code(), ECode.TOKEN_INVALID.message());
+        }
+
+        // 校验刷新Token是否过期
+        Long refreshTokenValidTime = tokenInfoPojo.getRefreshTokenValidTime();
+        if (System.currentTimeMillis() > refreshTokenValidTime) {
+            throw new EException(ECode.TOKEN_EXPIRED.code(), ECode.TOKEN_EXPIRED.message());
+        }
+    }
+
     public TokenInfoPojo getTokenInfo() {
         String token = ReqUtils.getRequestHeader("Union-Authorization");
         if(StringUtils.isEmpty(token)) {

src/main/java/com/esv/freight/app/common/filter/AuthFilter.java

@@ -41,6 +41,8 @@ public class AuthFilter implements Filter {
             "/app/driverBackend/grab/find/list",
             "/app/ownerBackend/password/reset",
             "/app/message/push2Account",
+            "/app/driverBackend/account/stop",
+            "/app/ownerBackend/account/stop",
             "/app/driverBackend/password/reset"};
 
     @Autowired
@@ -80,11 +82,23 @@ public class AuthFilter implements Filter {
 
         if (isCheckToken) {
             String token = request.getHeader("Union-Authorization");
-            try {
-                tokenComponent.checkAccessToken(token);
-            } catch (EException e) {
-                this.errorResponse(EResponse.error(e.getCode(), e.getMessage()), response);
-                return;
+
+            if("/app/driverBackend/account/token/refresh".equals(url) ||
+            "/app/ownerBackend/account/token/refresh".equals(url)) {
+                try {
+                    tokenComponent.checkRefreshToken(token);
+                } catch (EException e) {
+                    this.errorResponse(EResponse.error(e.getCode(), e.getMessage()), response);
+                    return;
+                }
+            }
+            else {
+                try {
+                    tokenComponent.checkAccessToken(token);
+                } catch (EException e) {
+                    this.errorResponse(EResponse.error(e.getCode(), e.getMessage()), response);
+                    return;
+                }
             }
         }
 

src/main/java/com/esv/freight/app/module/complaint/vo/ComplaintListItemVO.java

@@ -35,7 +35,7 @@ public class ComplaintListItemVO {
     private String waybillNo;
 
     /**
-     * 投诉处理状态.1-待处理；2-已处理；3c-已取消；
+     * 投诉处理状态.1-待处理；2-已处理；3-已取消；
      */
     private Integer complaintState;
 }

src/main/java/com/esv/freight/app/module/waybill/controller/OwnerWaybillController.java

@@ -14,6 +14,7 @@ import com.esv.freight.app.module.account.service.AppLoginService;
 import com.esv.freight.app.module.waybill.form.UploadEvidenceForm;
 import com.esv.freight.app.module.waybill.form.WaybillMultiQueryForm;
 import com.esv.freight.app.module.waybill.form.WaybillQueryForm;
+import com.esv.freight.app.module.waybill.vo.WaybillDetailVO;
 import com.esv.freight.app.module.waybill.vo.WaybillListItemVO;
 import com.esv.freight.app.module.waybill.vo.WaybillListVO;
 import lombok.extern.slf4j.Slf4j;
@@ -132,6 +133,56 @@ public class OwnerWaybillController {
         return EResponse.ok(pageResultVO);
     }
 
+    /**
+     * description 获取运单详情
+     * param waybillQueryForm
+     * return com.esv.freight.common.response.EResponse
+     * author 张志臣
+     * createTime 2020/04/26 15:00
+     **/
+    @PostMapping("/detail")
+    public EResponse detail(@RequestBody(required=false) @Validated(ValidatorDetail.class) WaybillQueryForm waybillQueryForm) {
+
+        // 调用获取运单详情接口
+        JSONObject reqJson = new JSONObject();
+        reqJson.put("id", waybillQueryForm.getWaybillId());
+        log.info(reqJson.toJSONString());
+        JSONObject result = tmsWaybillInterface.getWaybillDetail(reqJson);
+        log.info(result.toJSONString());
+
+        if(result.getInteger("code") != 200) {
+            return EResponse.error(result.getInteger("code"), result.getString("message"));
+        }
+
+        WaybillDetailVO waybillDetailVO = new WaybillDetailVO();
+        JSONObject data = result.getJSONObject("data");
+        waybillDetailVO.setId(data.getLong("id"));
+        waybillDetailVO.setGoodsDetail(data.getString("goodsDetail"));
+        waybillDetailVO.setGoodsUnitPrice(data.getBigDecimal("goodsUnitPrice"));
+        waybillDetailVO.setDeliveryAddressId(data.getLong("deliveryAddressId"));
+        waybillDetailVO.setDeliveryAddressName(data.getString("deliveryAddressName"));
+        waybillDetailVO.setDeliveryProvinceCode(data.getString("deliveryProvinceCode"));
+        waybillDetailVO.setDeliveryCityCode(data.getString("deliveryCityCode"));
+        waybillDetailVO.setDeliveryDistrictCode(data.getString("deliveryDistrictCode"));
+        waybillDetailVO.setDeliveryDetailAddress(data.getString("deliveryDetailAddress"));
+        waybillDetailVO.setDeliverer(data.getString("deliverer"));
+        waybillDetailVO.setDelivererPhone(data.getString("delivererPhone"));
+        waybillDetailVO.setReceiveAddressId(data.getLong("receiveAddressId"));
+        waybillDetailVO.setReceiveAddressName(data.getString("receiveAddressName"));
+        waybillDetailVO.setReceiveProvinceCode(data.getString("receiveProvinceCode"));
+        waybillDetailVO.setReceiveCityCode(data.getString("receiveCityCode"));
+        waybillDetailVO.setReceiveDistrictCode(data.getString("receiveDistrictCode"));
+        waybillDetailVO.setReceiveDetailAddress(data.getString("receiveDetailAddress"));
+        waybillDetailVO.setReceiver(data.getString("receiver"));
+        waybillDetailVO.setReceiverPhone(data.getString("receiverPhone"));
+        waybillDetailVO.setRequiredDeliveryTime(data.getDate("requiredDeliveryTime"));
+        waybillDetailVO.setRequiredReceiveTime(data.getDate("requiredReceiveTime"));
+        waybillDetailVO.setRequiredReceiptTime(data.getDate("requiredReceiptTime"));
+        waybillDetailVO.setDeliveryGoodsAmount(data.getBigDecimal("deliveryGoodsAmount"));
+        waybillDetailVO.setReceiveGoodsAmount(data.getBigDecimal("receiveGoodsAmount"));
+        return EResponse.ok(waybillDetailVO);
+    }
+
     /**
      * description 运单签收
      * param waybillQueryForm