支付回调不加书bug

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;
+        }
+    }
+}

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){//没有组装过

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);