Explorar el Código

(主账号)转变成企业用户后之前的订单统计的角标还是会统计。
(子账号)绑定企业用户后,之前自己订单会带入企业订单当中,包括待评价的订单

liangpeile hace 1 año
padre
commit
ee6df32394

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

@@ -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.eq(Order::getQyId, id).or().isNull(Order::getQyId));
         lqw.in(Order::getUid, ids);
-        List<Order> orderList1 = dao.selectList(lqw);
-
-
         if (0 != isRemit) {
             lqw.eq(Order::getIsRemit, isRemit);
             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.eq(Order::getIsUserDel, 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.eq(Order::getIsDel, false);
-
         HashMap<String, String> info = systemConfigService.info(19);
         String orderExpireTime = info.get("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");
         String mDateTime = formatter.format(c.getTime());
         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);
-
-        List<Order> orderList4 = dao.selectList(lqw);
         lqw.orderByDesc(Order::getId);
         List<Order> orderList = dao.selectList(lqw);
         return CommonPage.copyPageInfo(page, orderList);