merge

boot-service/src/main/java/com/xwbing/constant/CommonEnum.java

@@ -116,8 +116,8 @@ public class CommonEnum {
         QUESTION("问题件", 4),
         TO_TAKE("待取件", 5),
         TO_SEND("待派件", 6),
-        HAS_BEEN_SHIPPED("已发货", 8),
-        UFILLED("未发货", 9);
+        HAS_SHIPPED("已发货", 8),
+        UN_SHIPPED("未发货", 9);
         private String name;
         private int value;
 

boot-service/src/main/java/com/xwbing/service/other/ExpressDeliveryService.java

@@ -89,11 +89,11 @@ public class ExpressDeliveryService {
             logger.info("查询快递信息:{}", infoVo.getSuccess());
             String status = infoVo.getState();
             if (StringUtils.isEmpty(status)) {
-                status = String.valueOf(0);
+                status = "0";
             }
             int statusValue = Integer.valueOf(status);
-            CommonEnum.ExpressStatusEnum expressStatus = Arrays.stream(CommonEnum.ExpressStatusEnum.values()).filter(obj -> obj.getValue() == statusValue).findFirst().get();
-            infoVo.setDescribe(expressStatus.getName());
+            Optional<CommonEnum.ExpressStatusEnum> statusEnum = Arrays.stream(CommonEnum.ExpressStatusEnum.values()).filter(obj -> obj.getValue() == statusValue).findFirst();
+            statusEnum.ifPresent(expressStatusEnum -> infoVo.setDescribe(expressStatusEnum.getName()));
             // TODO: 2017/11/16 根据公司业务处理返回的信息......
         }
         return infoVo;