From 1c5f8c7f9c2542f8e2a7ebfc7c434ad77a11bf5d Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Fri, 3 Nov 2023 15:09:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=9B=9E=E8=B0=83=E4=B8=8D?=
 =?UTF-8?q?=E5=8A=A0=E4=B9=A6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/peanut/common/utils/MyUtil.java  | 14 ++++++++++++++
 .../book/service/impl/BuyOrderServiceImpl.java     |  7 +++++++
 .../book/service/impl/PointServiceImpl.java        |  3 ++-
 3 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/peanut/common/utils/MyUtil.java

diff --git a/src/main/java/com/peanut/common/utils/MyUtil.java b/src/main/java/com/peanut/common/utils/MyUtil.java
new file mode 100644
index 00000000..f1100977
--- /dev/null
+++ b/src/main/java/com/peanut/common/utils/MyUtil.java
@@ -0,0 +1,14 @@
+package com.peanut.common.utils;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+
+public class MyUtil {
+
+    public static boolean notEmpty(Object o){
+        if(o!=null&& StringUtils.isNotBlank(o.toString())){
+            return true;
+        }else {
+            return false;
+        }
+    }
+}
diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
index 51cfe19d..a7d33630 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java
@@ -397,6 +397,8 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
             }
             b.setProductList(buyOrderProducts);
             b.setTimestamp(b.getCreateTime().getTime()/1000);
+            //获取包裹信息
+//            getOrderByOS()
         }
 
         return buyOrderPage;
@@ -521,6 +523,11 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> impl
     }
 
 
+    /**
+     * 组装快递鸟专用我方订单号，应对同一订单号，他们生成的快递订单号是一个
+     * @param order
+     * @return
+     */
     private String getOrderByOS(String order){
         char salt;
         if(order.indexOf('_')==-1){//没有组装过
diff --git a/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java
index 0bc1374b..0346a82f 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/PointServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.peanut.common.utils.MyUtil;
 import com.peanut.modules.book.dao.PointCategoryDao;
 import com.peanut.modules.book.dao.PointDao;
 import com.peanut.modules.book.entity.PointCategoryEntity;
@@ -29,7 +30,7 @@ public class PointServiceImpl extends ServiceImpl<PointDao, PointEntity> impleme
         Integer limit = Integer.valueOf(map.get("limit").toString());
         Integer page = Integer.valueOf(map.get("page").toString());
         LambdaQueryWrapper<PointEntity> wrapper = new LambdaQueryWrapper<>();
-        if(map.containsKey("pointCategoryId")&& StringUtils.isNotBlank(map.get("pointCategoryId").toString())){
+        if(map.containsKey("pointCategoryId")&& MyUtil.notEmpty(map.containsKey("pointCategoryId"))){
             Integer id = Integer.valueOf(map.get("pointCategoryId").toString());
             List<Integer> ids = new ArrayList<>();
             createIds(id,ids);