diff --git a/crmeb/src/main/java/com/zbkj/crmeb/express/service/impl/ShippingTemplatesServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/express/service/impl/ShippingTemplatesServiceImpl.java index 791ff3b3..c9159129 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/express/service/impl/ShippingTemplatesServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/express/service/impl/ShippingTemplatesServiceImpl.java @@ -97,7 +97,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl shippingTemplatesFreeRequestList = request.getShippingTemplatesFreeRequestList(); - if(shippingTemplatesFreeRequestList.size() > 0 && request.getAppoint()){ + if(null != shippingTemplatesFreeRequestList && shippingTemplatesFreeRequestList.size() > 0 && request.getAppoint()){ shippingTemplatesFreeService.saveAll(shippingTemplatesFreeRequestList, request.getType(), shippingTemplates.getId()); } diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java index f60b7630..cc7e1926 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderServiceImpl.java @@ -914,12 +914,11 @@ public class StoreOrderServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); if(null != storeOrder.getUnique()){ - lambdaQueryWrapper.or().eq(StoreOrder::getOrderId, storeOrder.getUnique()) - .or().eq(StoreOrder::getUnique,storeOrder.getUnique()); + lambdaQueryWrapper.eq(StoreOrder::getOrderId, storeOrder.getUnique()); } - if(null != storeOrder.getUid()){ +// if(null != storeOrder.getUid()){ lambdaQueryWrapper.eq(StoreOrder::getUid, storeOrder.getUid()); - } +// } if(null != storeOrder.getIsDel()){ lambdaQueryWrapper.eq(StoreOrder::getIsDel, storeOrder.getIsDel()); } @@ -1071,16 +1070,17 @@ public class StoreOrderServiceImpl extends ServiceImpl orderPerList = getOrderPayedByDateLimit(perDateStart,dateStart); @@ -1097,7 +1097,7 @@ public class StoreOrderServiceImpl extends ServiceImpl= 0 ? 1:2); diff --git a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderVerificationImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderVerificationImpl.java index f59788b1..dff1ca82 100644 --- a/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderVerificationImpl.java +++ b/crmeb/src/main/java/com/zbkj/crmeb/store/service/impl/StoreOrderVerificationImpl.java @@ -115,6 +115,8 @@ public class StoreOrderVerificationImpl implements StoreOrderVerification { // 获取今日,昨日,本月,订单金额 String dayStart = DateUtil.nowDateTime(Constants.DATE_FORMAT_START); String dayEnd = DateUtil.nowDateTime(Constants.DATE_FORMAT_END); + String yesterdayStart = DateUtil.addDay(dayStart,-1,Constants.DATE_FORMAT_START); + String yesterdayEnd = DateUtil.addDay(dayEnd,-1,Constants.DATE_FORMAT_END); String monthStart = DateUtil.nowDateTime(Constants.DATE_FORMAT_MONTH_START); String monthEnd = DateUtil.getMonthEndDay(); @@ -132,7 +134,7 @@ public class StoreOrderVerificationImpl implements StoreOrderVerification { // 昨日订单数 LambdaQueryWrapper lqwPro = Wrappers.lambdaQuery(); - lqwPro.eq(StoreOrder::getIsDel,false).between(StoreOrder::getPayTime,dayStart,dayEnd) + lqwPro.eq(StoreOrder::getIsDel,false).between(StoreOrder::getCreateTime,yesterdayStart,yesterdayEnd) .eq(StoreOrder::getPaid, true).eq(StoreOrder::getRefundStatus,0); List storeOrdersPro = dao.selectList(lqwPro); if(null == storeOrdersPro) storeOrdersPro = new ArrayList<>();