订单筛选

crmeb-admin/src/main/java/com/zbkj/admin/controller/merchant/NewMerchantApi.java

@@ -509,26 +509,24 @@ public class NewMerchantApi {
     @ApiOperation(value = "发送短信手机号保存至信息模版表")
     @RequestMapping(value = "/savePhone", method = RequestMethod.POST)
     public CommonResult<?> savePhone(
-                                     @RequestParam(value = "tempId",required = false) String tempId,
-                                     @RequestParam(value = "saveType",required =false) String saveType,
-                                     @RequestParam(value = "pnone",required = false) String phone) {
+            @RequestParam(value = "tempId", required = false) String tempId,
+            @RequestParam(value = "saveType", required = false) String saveType,
+            @RequestParam(value = "pnone", required = false) String phone) {
         MerchantSmsTiming merchantSmsTiming = merchantSmsTimingService.selectByTempId(tempId);
-        if (null!=merchantSmsTiming){
-            if ("1".equals(saveType)){
+        if (null != merchantSmsTiming) {
+            if ("1".equals(saveType)) {
                 String BeforePhone = merchantSmsTiming.getPhone();
-                String AfterPhone=BeforePhone+","+phone;
+                String AfterPhone = BeforePhone + "," + phone;
                 merchantSmsTiming.setPhone(AfterPhone);
                 merchantSmsTimingService.updateById(merchantSmsTiming);
-            }else {
+            } else {
                 merchantSmsTiming.setPhone(phone);
                 merchantSmsTimingService.updateById(merchantSmsTiming);
             }
-
-
-        }else{
+        } else {
             MerchantSmsTiming merchantSmsTiming1 = new MerchantSmsTiming();
             SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
-            merchantSmsTiming1.setId(UUID.randomUUID().toString().replace("-",""));
+            merchantSmsTiming1.setId(UUID.randomUUID().toString().replace("-", ""));
             merchantSmsTiming1.setTempId(tempId);
             merchantSmsTiming1.setMerId(systemAdmin.getMerId());
             merchantSmsTiming1.setPhone(phone);

crmeb-front/src/main/java/com/zbkj/front/controller/NewFrontApi.java

@@ -128,18 +128,31 @@ public class NewFrontApi {
                 if (one1 == null) {
 //                    obj.put( "UserEnterprise",null);
                     obj.put("user", "普通用户");
+                    obj.put("isAllOrder", "2");
                     return CommonResult.success(obj);
                 } else {
                     UserEnterprise byId = userEnterpriseService.getById(one1.getEnterpriseId());
                     obj.put("UserEnterprise", byId);
                     obj.put("UserBypassAccount", one1);
                     obj.put("user", "企业子用户");
+                    Integer isAllOrders = info.getIsAllOrders();
+                    if (null!=isAllOrders){
+                        if (1==isAllOrders){
+                            obj.put("isAllOrder", "1");
+                        }else{
+                            obj.put("isAllOrder", "2");
+                        }
+                    }else{
+                        obj.put("isAllOrder", "2");
+                    }
+
 
                     return CommonResult.success(obj);
                 }
             } else {
                 obj.put("UserEnterprise", one);
                 obj.put("user", "企业用户");
+                obj.put("isAllOrder", "1");
                 return CommonResult.success(obj);
             }
         } catch (Exception e) {
@@ -231,7 +244,21 @@ public class NewFrontApi {
                                                                        @RequestParam(name = "isRemit") Integer isRemit,
                                                                        @PathVariable String id,
                                                                        @ModelAttribute PageParamRequest pageRequest) {
+
+
         LambdaQueryWrapper<UserBypassAccount> queryWrapper2 = new LambdaQueryWrapper<>();
+        //获取登录账号信息
+        User user = userService.getInfo();
+        if(null!=user.getIsAllOrders()){
+            if(3==user.getIsEnterpriseUser()&&1==user.getIsAllOrders()){
+                LambdaQueryWrapper<UserBypassAccount> queryWrapper3 = new LambdaQueryWrapper<>();
+                queryWrapper3.eq(UserBypassAccount::getEnterpriseId, user.getId());
+                UserBypassAccount one = userBypassAccountService.getOne(queryWrapper3);
+                Integer enterpriseId = one.getEnterpriseId();
+                id= String.valueOf(enterpriseId);
+            }
+        }
+
         queryWrapper2.eq(UserBypassAccount::getEnterpriseId, id);
 
         if (!department.equals("")) {

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

@@ -137,20 +137,16 @@ public class CartServiceImpl extends ServiceImpl<CartDao, Cart> implements CartS
         lqw.in(CartShare::getId, ids);
         lqw.orderByDesc(CartShare::getId);
         List<CartShare> cartList = cartShareDao.selectList(lqw);
-        for (CartShare cartShare : cartList) {
-            Date endTime = cartShare.getEndTime();
-            Date date = new Date();
-            if (date.after(endTime)){
-                cartShare.setIsInvalid(0);
-            }else {
-                cartShare.setIsInvalid(1);
-            }
-            cartShareDao.updateById(cartShare);
-
-
-        }
-
-
+//        for (CartShare cartShare : cartList) {
+//            Date endTime = cartShare.getEndTime();
+//            Date date = new Date();
+//            if (date.after(endTime)){
+//                cartShare.setIsInvalid(0);
+//            }else {
+//                cartShare.setIsInvalid(1);
+//            }
+//            cartShareDao.updateById(cartShare);
+//        }
 
         if (CollUtil.isEmpty(cartList)) {
             return CollUtil.newArrayList();
@@ -163,12 +159,12 @@ public class CartServiceImpl extends ServiceImpl<CartDao, Cart> implements CartS
             CartMerchantResponse merchantResponse = new CartMerchantResponse();
             merchantResponse.setMerId(merId);
             merchantResponse.setIsInvalid(1);
-            for (CartShare cartShare : cartList) {
-                if (0==cartShare.getIsInvalid()){
-                    merchantResponse.setIsInvalid(0);
-                }
-
-            }
+//            for (CartShare cartShare : cartList) {
+//                if (0==cartShare.getIsInvalid()){
+//                    merchantResponse.setIsInvalid(0);
+//                }
+//
+//            }
             merchantResponse.setMerName(merchantMap.get(merId).getName());
             List<CartShare> merCartList = cartList.stream().filter(e -> e.getMerId().equals(merId)).collect(Collectors.toList());
             List<CartInfoResponse> infoResponseList = merCartList.stream().map(storeCart -> {

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

@@ -203,14 +203,10 @@ 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);
-        if (1 == isRemit) {
+        if (0!= isRemit) {
             lqw.eq(Order::getIsRemit, isRemit);
+            lqw.eq(Order::getPayType, "信用额度");
         }
-        if ( 2 == isRemit) {
-            lqw.eq (Order::getIsRemit,2);
-        }
-
-
         if (status >= 0) {
             if (status == 1) {
                 lqw.in(Order::getStatus, OrderConstants.ORDER_STATUS_WAIT_SHIPPING, OrderConstants.ORDER_STATUS_PART_SHIPPING);