fix

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

@@ -16,11 +16,10 @@ import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoQuery
 import com.starry.admin.modules.clerk.module.vo.PlayClerkUnsettledWagesInfoReturnVo;
 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.module.vo.PlayCustomRankingReturnVo;
 import com.starry.admin.modules.follow.module.entity.PlayCustomFollowInfoEntity;
 import com.starry.admin.modules.follow.service.IPlayCustomFollowInfoService;
 import com.starry.admin.modules.order.module.entity.PlayOrderInfoEntity;
+import com.starry.admin.modules.order.service.IPlayOrderInfoService;
 import com.starry.admin.modules.weichat.entity.PlayClerkUserLoginResponseVo;
 import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoQueryVo;
 import com.starry.admin.modules.weichat.entity.clerk.PlayClerkUserInfoResultVo;
@@ -60,6 +59,9 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
     @Resource
     private IPlayBalanceDetailsInfoService playBalanceDetailsInfoService;
 
+    @Resource
+    private IPlayOrderInfoService playOrderInfoService;
+
 
     @Override
     public PlayClerkLevelInfoEntity queryLevelCommission(String clerkId) {
@@ -229,9 +231,6 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
         MPJLambdaWrapper<PlayClerkUserInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>();
         //主表（店员表全部字段）
         lambdaQueryWrapper.selectAll(PlayClerkUserInfoEntity.class);
-        //订单表
-        lambdaQueryWrapper.selectCollection(PlayOrderInfoEntity.class, PlayCustomRankingReturnVo::getOrderInfos);
-        lambdaQueryWrapper.leftJoin(PlayOrderInfoEntity.class, PlayOrderInfoEntity::getAcceptBy, PlayCustomUserInfoEntity::getId);
         if(StrUtil.isNotBlank(vo.getId())) {
             lambdaQueryWrapper.eq(PlayClerkUserInfoEntity::getId, vo.getId());
         }
@@ -296,10 +295,7 @@ public class PlayClerkUserInfoServiceImpl extends ServiceImpl<PlayClerkUserInfoM
             BigDecimal orderTotalAmount = new BigDecimal("0");
             int orderContinueNumber = 0;
             int orderNumber = 0;
-            for (PlayOrderInfoEntity orderInfo : record.getOrderInfos()) {
+            for (PlayOrderInfoEntity orderInfo : playOrderInfoService.queryBySettlementOrder(record.getId(), "")) {
-                if (orderInfo.getId() == null) {
-                    continue;
-                }
                 if ("0".equals(orderInfo.getFirstOrder())) {
                     orderContinueNumber++;
                 }

play-admin/src/main/java/com/starry/admin/modules/order/service/IPlayOrderInfoService.java

@@ -143,12 +143,13 @@ public interface IPlayOrderInfoService extends IService<PlayOrderInfoEntity> {
 
 
     /**
-     * 查询未结算订单
+     * 根据订单结算状态查询订单
      *
      * @param clerkId 店员ID
+     * @param orderSettlementState 订单结算状态(0:未结算;1:已结算)
      * @return List<PlayOrderInfoEntity>
      */
-    List<PlayOrderInfoEntity> queryNotSettlementOrder(String clerkId);
+    List<PlayOrderInfoEntity> queryBySettlementOrder(String clerkId,String orderSettlementState);
 
 
     /**

play-admin/src/main/java/com/starry/admin/modules/order/service/impl/PlayOrderInfoServiceImpl.java

@@ -305,10 +305,13 @@ public class PlayOrderInfoServiceImpl extends ServiceImpl<PlayOrderInfoMapper, P
     }
 
     @Override
-    public List<PlayOrderInfoEntity> queryNotSettlementOrder(String clerkId) {
+    public List<PlayOrderInfoEntity> queryBySettlementOrder(String clerkId, String orderSettlementState) {
         MPJLambdaWrapper<PlayOrderInfoEntity> lambdaQueryWrapper = new MPJLambdaWrapper<>();
         lambdaQueryWrapper.eq(PlayOrderInfoEntity::getAcceptBy, clerkId);
-        lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderSettlementState, "0");
+        if (StrUtil.isNotBlank(orderSettlementState)) {
+            lambdaQueryWrapper.eq(PlayOrderInfoEntity::getOrderSettlementState, orderSettlementState);
+        }
+
         return this.baseMapper.selectList(lambdaQueryWrapper);
     }
 

play-admin/src/main/java/com/starry/admin/modules/weichat/controller/WxClerkWagesController.java

@@ -55,7 +55,7 @@ public class WxClerkWagesController {
     @ClerkUserLogin
     @GetMapping("clerk/queryUnsettledWages")
     public R clerkQueryUnsettledWages() {
-        List<PlayOrderInfoEntity> list = playOrderInfoService.queryNotSettlementOrder(ThreadLocalRequestDetail.getClerkUserInfo().getId());
+        List<PlayOrderInfoEntity> list = playOrderInfoService.queryBySettlementOrder(ThreadLocalRequestDetail.getClerkUserInfo().getId(),"0");
         BigDecimal orderMoney = BigDecimal.ZERO;
         BigDecimal estimatedRevenue = BigDecimal.ZERO;
         for (PlayOrderInfoEntity entity : list) {