配置增加非空判断

crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java

@@ -242,13 +242,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         lqw.in(Order::getType, OrderConstants.ORDER_TYPE_NORMAL, OrderConstants.ORDER_TYPE_SECKILL);
         lqw.eq(Order::getIsDel, false);
         HashMap<String, String> info = systemConfigService.info(19);
+
         String orderExpireTime = info.get("orderExpireTime");
-        String orderExpireTime1 = "-" + orderExpireTime;
-        Calendar c = Calendar.getInstance();
-        c.add(Calendar.DAY_OF_MONTH, Integer.parseInt(orderExpireTime1));
-        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String mDateTime = formatter.format(c.getTime());
-        lqw.apply(StringUtils.isNotBlank(mDateTime), "DATE(create_time) >= STR_TO_DATE('" + mDateTime + "','%Y-%m-%d')");
+        if (StringUtils.isNotBlank(orderExpireTime)) {
+            String orderExpireTime1 = "-" + orderExpireTime;
+            Calendar c = Calendar.getInstance();
+            c.add(Calendar.DAY_OF_MONTH, Integer.parseInt(orderExpireTime1));
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            String mDateTime = formatter.format(c.getTime());
+            lqw.apply(StringUtils.isNotBlank(mDateTime), "DATE(create_time) >= STR_TO_DATE('" + mDateTime + "','%Y-%m-%d')");
+        }
         lqw.in(Order::getIsEnterpriseUser, 2, 3);
         lqw.orderByDesc(Order::getId);
         List<Order> orderList = dao.selectList(lqw);
@@ -333,7 +336,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         LambdaQueryWrapper<Order> lqw = Wrappers.lambdaQuery();
         lqw.select(Order::getOrderNo, Order::getUid, Order::getPayPrice, Order::getPayType, Order::getPaid, Order::getStatus, Order::getRefundStatus,
                 Order::getIsUserDel, Order::getCancelStatus, Order::getType, Order::getCreateTime, Order::getLevel,
-                Order::getIsRemit, Order::getAccount, Order::getQyName,Order::getProcureUnit,Order::getQyId);
+                Order::getIsRemit, Order::getAccount, Order::getQyName, Order::getProcureUnit, Order::getQyId);
         lqw.eq(Order::getMerId, systemAdmin.getMerId());
         //这个方法查询不是属于积分支付的订单  不是
 //        lqw.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral);