fix

play-admin/src/main/java/com/starry/admin/modules/clerk/controller/PlayClerkUserInfoController.java

@@ -1,5 +1,6 @@
 package com.starry.admin.modules.clerk.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.starry.admin.modules.clerk.module.entity.PlayClerkUserInfoEntity;
 import com.starry.admin.modules.clerk.module.entity.PlayClerkUserQueryVo;
@@ -8,6 +9,8 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkUserEditVo;
 import com.starry.admin.modules.clerk.module.vo.PlayClerkUserStateEditVo;
 import com.starry.admin.modules.clerk.service.IPlayClerkCommodityService;
 import com.starry.admin.modules.clerk.service.IPlayClerkUserInfoService;
+import com.starry.admin.modules.custom.module.entity.PlayCustomUserInfoEntity;
+import com.starry.admin.modules.custom.service.IPlayCustomUserInfoService;
 import com.starry.admin.modules.play.service.IPlayUserInfoService;
 import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoQueryVo;
 import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoResultVo;
@@ -19,6 +22,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 店员Controller
@@ -33,6 +37,8 @@ public class PlayClerkUserInfoController {
     @Resource
     private IPlayUserInfoService playUserInfoService;
     @Resource
+    private IPlayCustomUserInfoService customUserInfoService;
+    @Resource
     private IPlayClerkUserInfoService playClerkUserInfoService;
 
     @Resource
@@ -47,6 +53,13 @@ public class PlayClerkUserInfoController {
         return R.ok(list);
     }
 
+    @GetMapping("/simple/list")
+    public R simpleList() {
+        List<PlayClerkUserInfoEntity> clerkList = playClerkUserInfoService.simpleList();
+        List<PlayCustomUserInfoEntity> customerList = customUserInfoService.simpleList();
+        return R.ok(new JSONObject().fluentPut("clerkList", clerkList).fluentPut("customerList", customerList));
+    }
+
 
     /**
      * 查询店员列表

play-admin/src/main/java/com/starry/admin/modules/clerk/service/IPlayClerkUserInfoService.java

@@ -174,4 +174,6 @@ public interface IPlayClerkUserInfoService extends IService<PlayClerkUserInfoEnt
      * @return 结果
      */
     int deletePlayClerkUserInfoById(String id);
+
+    List<PlayClerkUserInfoEntity> simpleList();
 }

play-admin/src/main/java/com/starry/admin/modules/clerk/service/impl/PlayClerkUserInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.starry.admin.modules.clerk.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -379,4 +380,10 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
     public int deletePlayClerkUserInfoById(String id) {
         return playClerkUserInfoMapper.deleteById(id);
     }
+
+    @Override
+    public List<PlayClerkUserInfoEntity> simpleList() {
+        LambdaQueryWrapper<PlayClerkUserInfoEntity> wrapper = Wrappers.lambdaQuery(PlayClerkUserInfoEntity.class).eq(PlayClerkUserInfoEntity::getDeleted, 0).select(PlayClerkUserInfoEntity::getId, PlayClerkUserInfoEntity::getNickname, PlayClerkUserInfoEntity::getAvatar).orderByDesc(PlayClerkUserInfoEntity::getId);
+        return this.list(wrapper);
+    }
 }

play-admin/src/main/java/com/starry/admin/modules/custom/service/IPlayCustomUserInfoService.java

@@ -9,6 +9,7 @@ import com.starry.admin.modules.custom.module.vo.PlayCustomUserQueryVo;
 import com.starry.admin.modules.custom.module.vo.PlayCustomUserReturnVo;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 顾客Service接口
@@ -117,4 +118,6 @@ public interface IPlayCustomUserInfoService extends IService<PlayCustomUserInfoE
      * @return 结果
      */
     int deletePlayCustomUserInfoById(String id);
+
+    List<PlayCustomUserInfoEntity> simpleList();
 }

play-admin/src/main/java/com/starry/admin/modules/custom/service/impl/PlayCustomUserInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.starry.admin.modules.custom.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -236,11 +237,11 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl<PlayCustomUserInf
 
 
     @Override
-    public void updateAccountBalanceById(String userId, BigDecimal balanceBeforeOperation, BigDecimal balanceAfterOperation, String operationType, String operationAction,BigDecimal balanceMoney,String orderId) {
+    public void updateAccountBalanceById(String userId, BigDecimal balanceBeforeOperation, BigDecimal balanceAfterOperation, String operationType, String operationAction, BigDecimal balanceMoney, String orderId) {
         //更新余额
         this.baseMapper.updateById(new PlayCustomUserInfoEntity(userId, balanceAfterOperation));
         //记录余额变更记录
-        playBalanceDetailsInfoService.create("1", userId, balanceBeforeOperation, balanceAfterOperation, operationType, operationAction,balanceMoney,orderId);
+        playBalanceDetailsInfoService.create("1", userId, balanceBeforeOperation, balanceAfterOperation, operationType, operationAction, balanceMoney, orderId);
     }
 
     /**
@@ -275,4 +276,11 @@ public class PlayCustomUserInfoServiceImpl extends ServiceImpl<PlayCustomUserInf
     public int deletePlayCustomUserInfoById(String id) {
         return playCustomUserInfoMapper.deleteById(id);
     }
+
+    @Override
+    public List<PlayCustomUserInfoEntity> simpleList() {
+        LambdaQueryWrapper<PlayCustomUserInfoEntity> wrapper = Wrappers.lambdaQuery(PlayCustomUserInfoEntity.class);
+        wrapper.orderByDesc(PlayCustomUserInfoEntity::getId).eq(PlayCustomUserInfoEntity::getDeleted, 0).select(PlayCustomUserInfoEntity::getAvatar, PlayCustomUserInfoEntity::getId, PlayCustomUserInfoEntity::getNickname, PlayCustomUserInfoEntity::getAvatar);
+        return baseMapper.selectList(wrapper);
+    }
 }