|
@@ -212,9 +212,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
|
|
lqw.and(i -> i.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral));
|
|
lqw.and(i -> i.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral));
|
|
lqw.and(i -> i.eq(Order::getQyId, id).or().isNull(Order::getQyId));
|
|
lqw.and(i -> i.eq(Order::getQyId, id).or().isNull(Order::getQyId));
|
|
lqw.in(Order::getUid, ids);
|
|
lqw.in(Order::getUid, ids);
|
|
- List<Order> orderList1 = dao.selectList(lqw);
|
|
|
|
-
|
|
|
|
-
|
|
|
|
if (0 != isRemit) {
|
|
if (0 != isRemit) {
|
|
lqw.eq(Order::getIsRemit, isRemit);
|
|
lqw.eq(Order::getIsRemit, isRemit);
|
|
lqw.eq(Order::getPayType, "信用额度");
|
|
lqw.eq(Order::getPayType, "信用额度");
|
|
@@ -233,11 +230,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
|
|
lqw.lt(Order::getRefundStatus, OrderConstants.ORDER_REFUND_STATUS_REFUND);
|
|
lqw.lt(Order::getRefundStatus, OrderConstants.ORDER_REFUND_STATUS_REFUND);
|
|
lqw.eq(Order::getIsUserDel, false);
|
|
lqw.eq(Order::getIsUserDel, false);
|
|
lqw.eq(Order::getIsMerchantDel, false);
|
|
lqw.eq(Order::getIsMerchantDel, false);
|
|
- List<Order> orderList2 = dao.selectList(lqw);
|
|
|
|
-
|
|
|
|
lqw.in(Order::getType, OrderConstants.ORDER_TYPE_NORMAL, OrderConstants.ORDER_TYPE_SECKILL);
|
|
lqw.in(Order::getType, OrderConstants.ORDER_TYPE_NORMAL, OrderConstants.ORDER_TYPE_SECKILL);
|
|
lqw.eq(Order::getIsDel, false);
|
|
lqw.eq(Order::getIsDel, false);
|
|
-
|
|
|
|
HashMap<String, String> info = systemConfigService.info(19);
|
|
HashMap<String, String> info = systemConfigService.info(19);
|
|
String orderExpireTime = info.get("orderExpireTime");
|
|
String orderExpireTime = info.get("orderExpireTime");
|
|
String orderExpireTime1 = "-" + orderExpireTime;
|
|
String orderExpireTime1 = "-" + orderExpireTime;
|
|
@@ -246,10 +240,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
|
|
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
String mDateTime = formatter.format(c.getTime());
|
|
String mDateTime = formatter.format(c.getTime());
|
|
lqw.apply(StringUtils.isNotBlank(mDateTime), "DATE(create_time) >= STR_TO_DATE('" + mDateTime + "','%Y-%m-%d')");
|
|
lqw.apply(StringUtils.isNotBlank(mDateTime), "DATE(create_time) >= STR_TO_DATE('" + mDateTime + "','%Y-%m-%d')");
|
|
- List<Order> orderList3 = dao.selectList(lqw);
|
|
|
|
lqw.in(Order::getIsEnterpriseUser, 2,3);
|
|
lqw.in(Order::getIsEnterpriseUser, 2,3);
|
|
-
|
|
|
|
- List<Order> orderList4 = dao.selectList(lqw);
|
|
|
|
lqw.orderByDesc(Order::getId);
|
|
lqw.orderByDesc(Order::getId);
|
|
List<Order> orderList = dao.selectList(lqw);
|
|
List<Order> orderList = dao.selectList(lqw);
|
|
return CommonPage.copyPageInfo(page, orderList);
|
|
return CommonPage.copyPageInfo(page, orderList);
|