用户车个人信息等bug

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

@@ -94,7 +94,7 @@ public class AAAServiceImpl implements AAAService {
 //                return null;
 //            }
             updateAccessToken();
-            redisUtil.set("wxaccessToken", accessToken, 0L);
+            redisUtil.set("wxaccessToken", accessToken, 1L);
         }
         String accessToken2 = redisUtil.get("wxaccessToken");
         try {

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

@@ -371,6 +371,7 @@ public class FrontOrderServiceImpl implements FrontOrderService {
         order.setPayPrice( order.getProTotalPrice().add( order.getTotalPostage() ).subtract( order.getCouponPrice() ).subtract( order.getIntegralPrice() ) );
         order.setPayPostage( order.getTotalPostage() );
         order.setPaid( false );
+        order.setIsRemit( 2 );
         order.setCancelStatus( OrderConstants.ORDER_CANCEL_STATUS_NORMAL );
         order.setLevel( OrderConstants.ORDER_LEVEL_PLATFORM );
         order.setType( orderInfoVo.getType() );// 默认普通订单

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

@@ -84,6 +84,8 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
     private OrganizationDepartmentService organizationDepartmentService;
     @Autowired
     private UserBypassAccountService userBypassAccountService;
+    @Autowired
+    private UserEnterpriseService userEnterpriseService;
 
 
     /**
@@ -130,23 +132,31 @@ public class UserCenterServiceImpl extends ServiceImpl<UserDao, User> implements
             response.setIsPromoter(true);
         }
         //企业用户获取企业以及部门
-        LambdaQueryWrapper<UserBypassAccount> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(UserBypassAccount::getUserId, uid);
-        queryWrapper.eq(UserBypassAccount::getIsDelete, 0);
-        UserBypassAccount one = userBypassAccountService.getOne(queryWrapper);
-        if (null!=one){
-            response.setQyName("");
-            response.setBmName(one.getDepartment());
-            response.setRealName(one.getRealName());
-        }else{
-            response.setQyName("");
-            response.setBmName("");
-            response.setRealName("");
-        }
-
-
+        LambdaQueryWrapper<UserEnterprise> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(UserEnterprise::getUserId, uid);
+        UserEnterprise userEnterprise = userEnterpriseService.getOne(queryWrapper);
+        User user1 = userService.getById(uid);
 
+        if (null!=userEnterprise){
+            if (2 == user1.getIsEnterpriseUser()) {
+                response.setQyName(userEnterprise.getEnterpriseName());
+                response.setBmName("主账号");
+                response.setRealName(userEnterprise.getRealName());
+            }
+        }
+        else {
+            LambdaQueryWrapper<UserBypassAccount> queryWrapper1 = new LambdaQueryWrapper<>();
+            queryWrapper1.eq(UserBypassAccount::getUserId, uid);
+            UserBypassAccount userBypassAccount = userBypassAccountService.getOne(queryWrapper1);
+            Integer enterpriseId = userBypassAccount.getEnterpriseId();
+            LambdaQueryWrapper<UserEnterprise> queryWrapper2 = new LambdaQueryWrapper<>();
+            queryWrapper2.eq(UserEnterprise::getId, enterpriseId);
+            UserEnterprise userEnterprise1 = userEnterpriseService.getOne(queryWrapper2);
 
+            response.setQyName(userEnterprise1.getEnterpriseName());
+            response.setBmName(userBypassAccount.getDepartment());
+            response.setRealName(userBypassAccount.getRealName());
+        }
         // 保存用户访问记录
         asyncService.visitUserCenter(user.getId());
         return response;

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

@@ -41,6 +41,7 @@ import com.zbkj.common.vo.MyRecord;
 import com.zbkj.service.dao.OrderDao;
 import com.zbkj.service.dao.UserDao;
 import com.zbkj.service.service.*;
+import io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -205,8 +206,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         if (1 == isRemit) {
             lqw.eq(Order::getIsRemit, isRemit);
         }
-        if (null == isRemit || 2 == isRemit) {
-            lqw.notIn(Order::getIsRemit, 1);
+        if ( 2 == isRemit) {
+            lqw.eq (Order::getIsRemit,2);
         }