待评价订单统计

crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java

@@ -392,8 +392,19 @@ public class FrontOrderServiceImpl implements FrontOrderService {
             queryWrapper.eq(UserBypassAccount::getUserId,user.getId());
             queryWrapper.eq(UserBypassAccount::getIsDelete,0);
             List<UserBypassAccount> list = userBypassAccountService.list();
-            Integer enterpriseId = list.get(0).getEnterpriseId();
-            order.setEnterpriseId(enterpriseId);
+            if (null!=list&&list.size()>0){
+                Integer enterpriseId = list.get(0).getEnterpriseId();
+                order.setEnterpriseId(enterpriseId);
+            }else{
+                LambdaQueryWrapper<UserEnterprise> userEnterpriseLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                userEnterpriseLambdaQueryWrapper.eq(UserEnterprise::getUserId,user.getId());
+                userEnterpriseLambdaQueryWrapper.eq(UserEnterprise::getIsDelete,0);
+                List<UserEnterprise> list1 = userEnterpriseService.list();
+                if (null!=list&&list.size()>0){
+                    Integer enterpriseId = list1.get(0).getId();
+                    order.setEnterpriseId(enterpriseId);
+                }
+            }
         }
 
         // 商户订单

crmeb-front/src/main/java/com/zbkj/front/service/impl/UserCenterServiceImpl.java

@@ -96,7 +96,6 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
     @Override
     public UserCenterResponse getUserCenterInfo() {
         Integer uid = userService.getUserId();
-       uid =50;
         UserCenterResponse response = new UserCenterResponse();
         response.setCenterBanner(systemGroupDataService.getListMapByGid(GroupDataConstants.GROUP_DATA_ID_USER_CENTER_BANNER));
         response.setCenterMenu(systemGroupDataService.getListMapByGid(GroupDataConstants.GROUP_DATA_ID_USER_CENTER_MENU));

crmeb-service/src/main/java/com/zbkj/service/dao/OrderDetailDao.java

@@ -22,7 +22,9 @@ public interface OrderDetailDao extends BaseMapper<OrderDetail> {
      * @param userId 用户id
      * @param isReply 是否评价，0-未评价，1-已评价
      */
-    List<OrderDetail> findReplyList(@Param("userId") Integer userId, @Param("isReply") Integer isReply,@Param("isEnterpriseUser") Integer isEnterpriseUser);
+    List<OrderDetail> findReplyList(@Param("userId") Integer userId, @Param("isReply") Integer isReply,
+                                    @Param("isEnterpriseUser") Integer isEnterpriseUser,
+                                    @Param("enterpriseId") Integer enterpriseId);
 
     /**
      * 售后申请列表(可申请售后列表)
@@ -49,5 +51,6 @@ public interface OrderDetailDao extends BaseMapper<OrderDetail> {
      * 获取待评价数量
      * @return 待评价数量
      */
-    Integer getAwaitReplyCount(@Param("userId") Integer userId);
+    Integer getAwaitReplyCount(@Param("userId") Integer userId,@Param("isEnterpriseUser") Integer isEnterpriseUser,
+                               @Param("enterpriseId") Integer enterpriseId);
 }

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

@@ -10,11 +10,14 @@ import com.github.pagehelper.PageInfo;
 import com.zbkj.common.model.order.Order;
 import com.zbkj.common.model.order.OrderDetail;
 import com.zbkj.common.model.user.User;
+import com.zbkj.common.model.user.UserBypassAccount;
+import com.zbkj.common.model.user.UserEnterprise;
 import com.zbkj.common.page.CommonPage;
 import com.zbkj.common.request.PageParamRequest;
 import com.zbkj.service.dao.OrderDetailDao;
 import com.zbkj.service.service.OrderDetailService;
 import com.zbkj.service.service.OrderService;
+import com.zbkj.service.service.UserBypassAccountService;
 import com.zbkj.service.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,6 +39,8 @@ public class OrderDetailServiceImpl extends ServiceImpl<OrderDetailDao, OrderDet
     private OrderService orderService;
     @Autowired
     private UserService userService;
+    @Autowired
+    private UserBypassAccountService userBypassAccountService;
 
     /**
      * 根据主订单号获取
@@ -60,8 +65,15 @@ public class OrderDetailServiceImpl extends ServiceImpl<OrderDetailDao, OrderDet
     public PageInfo<OrderDetail> getReplyList(Integer userId, Boolean isReply, PageParamRequest pageRequest) {
         User user = userService.getInfo();
         Integer isEnterpriseUser = user.getIsEnterpriseUser();
+        Integer enterpriseId=0;
+        if (3==isEnterpriseUser){
+            LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(UserBypassAccount::getUserId,user.getId());
+            UserBypassAccount one = userBypassAccountService.getOne(queryWrapper);
+            enterpriseId = one.getEnterpriseId();
+        }
         Page<OrderDetail> page = PageHelper.startPage(pageRequest.getPage(), pageRequest.getLimit());
-        List<OrderDetail> orderDetailList = dao.findReplyList(userId, isReply ? 1 : 0,isEnterpriseUser);
+        List<OrderDetail> orderDetailList = dao.findReplyList(userId, isReply ? 1 : 0,isEnterpriseUser,enterpriseId);
         return CommonPage.copyPageInfo(page, orderDetailList);
     }
 
@@ -131,7 +143,16 @@ public class OrderDetailServiceImpl extends ServiceImpl<OrderDetailDao, OrderDet
      */
     @Override
     public Integer getAwaitReplyCount(Integer userId) {
-        return dao.getAwaitReplyCount(userId);
+        User user = userService.getInfo();
+        Integer isEnterpriseUser = user.getIsEnterpriseUser();
+        Integer enterpriseId=0;
+        if (3==isEnterpriseUser){
+            LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(UserBypassAccount::getUserId,user.getId());
+            UserBypassAccount one = userBypassAccountService.getOne(queryWrapper);
+            enterpriseId = one.getEnterpriseId();
+        }
+        return dao.getAwaitReplyCount(userId,isEnterpriseUser,enterpriseId);
     }
 }
 

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

@@ -1171,20 +1171,26 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserS
         //注销企业用户
         LambdaQueryWrapper<UserEnterprise> enterpriseLambdaQueryWrapper = new LambdaQueryWrapper<>();
         enterpriseLambdaQueryWrapper.eq(UserEnterprise::getUserId, user.getId());
-        UserEnterprise one = userEnterpriseService.getOne(enterpriseLambdaQueryWrapper);
-        if (null!=one){
-            BigDecimal usedLineOfCredit = one.getUsedLineOfCredit();
-            int i = usedLineOfCredit.compareTo(BigDecimal.valueOf(0));
-            if (i > 0) {
-                return false;
+        List<UserEnterprise> one = userEnterpriseService.list(enterpriseLambdaQueryWrapper);
+        if (null!=one&one.size()>0){
+            for (UserEnterprise userEnterprise : one) {
+                BigDecimal usedLineOfCredit = userEnterprise.getUsedLineOfCredit();
+                int i = usedLineOfCredit.compareTo(BigDecimal.valueOf(0));
+                if (i > 0) {
+                    return false;
+                }
             }
+
         }
 
         userEnterpriseService.remove(enterpriseLambdaQueryWrapper);
-        if (null != one) {
-            LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(UserBypassAccount::getEnterpriseId, one.getId());
-            userBypassAccountService.remove(queryWrapper);
+        if (null != one&&one.size()>0) {
+            for (UserEnterprise userEnterprise : one) {
+                LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
+                queryWrapper.eq(UserBypassAccount::getEnterpriseId, userEnterprise.getId());
+                userBypassAccountService.remove(queryWrapper);
+            }
+
         }
         //注销企业子用户
         LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();

crmeb-service/src/main/resources/mapper/order/OrderDetailMapper.xml

@@ -10,6 +10,7 @@
         and od.is_reply = #{isReply}
         and od.uid = #{userId}
         and o.is_enterprise_user = #{isEnterpriseUser}
+        and o.enterprise_id = #{enterpriseId}
         order by od.id desc
     </select>
 
@@ -47,7 +48,9 @@
         od.is_receipt = 1
         and od.is_reply = 0
         and od.uid = #{userId}
+        and o.is_enterprise_user = #{isEnterpriseUser}
         and (o.is_integral != 1 or o.is_integral is null)
+        and o.enterprise_id = #{enterpriseId}
         and o.is_del=0
     </select>
 </mapper>