11

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java

@@ -12,9 +12,11 @@ import com.alibaba.excel.write.metadata.fill.FillConfig;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.constant.enums.MerchantTypeEnum;
 import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.common.data.datascope.DataScopeFuncEnum;
 import com.bsd.pjcloud.common.idempotent.annotation.Idempotent;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
 import com.bsd.pjcloud.common.security.annotation.Inner;
@@ -36,6 +38,8 @@ import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper;
 import com.bsd.pjcloud.hard.service.HardManagerService;
 import com.bsd.pjcloud.hard.service.HardOrderService;
 import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
+import com.bsd.pjcloud.wallet.api.feign.RemoteMchService;
+import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
@@ -73,6 +77,8 @@ public class HardOrderController {
 
     private final HardOrderMapper hardOrderMapper;
 
+    private final RemoteMchService mchService;
+
     /* ************************************* start 远程调用 start ************************************* */
     @Inner
     @Operation(summary = "app查询订单列表", description = "app查询订单列表")
@@ -151,12 +157,14 @@ public class HardOrderController {
     @GetMapping("/page-join")
     @PreAuthorize("@pms.hasPermission('hard_hardwareOrder_view')")
     public R pageJoin(@ParameterObject Page page, @ParameterObject HardOrderDto dto) {
-        DataScope dataScope = DataScope.of();
-        dataScope.setScopeDeptName("user_dept_id");
         PjcloudUser user = SecurityUtils.getUser();
         CurrentUserHardTypeInfoDto hardTypeInfo = hardManagerService.getCurrentUserHardTypeInfo(user);
         dto.setMchTypeCodes(hardTypeInfo.getHardTypeList());
-        return R.ok(hardwareOrderService.scopePageList(page, dto, dataScope));
+        MchManageVo data = mchService.getByDeptId(user.getDeptId(), MerchantTypeEnum.SELF_SUPERMARKET).getData();
+        if (ObjectUtil.isNotEmpty(data)) {
+            dto.setMerchantId(data.getId());
+        }
+        return R.ok(hardwareOrderService.scopePageList(page, dto));
     }
 
     @Operation(summary = "通过id查询", description = "通过id查询")

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java

@@ -84,7 +84,7 @@ public interface HardOrderMapper extends PjcloudBaseMapper<HardOrderEntity> {
         return selectListByScope(commonWrapper(dto), DataScope.of());
     }
 
-    Page<HardOrderVo> scopePageList(Page page, @Param("dto") HardOrderDto dto, @Param("dataScope") DataScope dataScope);
+    Page<HardOrderVo> scopePageList(Page page, @Param("dto") HardOrderDto dto);
 
     List<HardOrderSbVo> listSb(@Param("dto") HardOrderDto dto, DataScope dataScope);
 

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderService.java

@@ -24,7 +24,7 @@ public interface HardOrderService extends IService<HardOrderEntity> {
      */
     Page<HardOrderVo> appMchPageJoin(Page page, HardOrderDto dto, PjcloudUser user);
 
-    Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto, DataScope dataScope);
+    Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto);
 
     List<HardOrderVo> scopeList(HardOrderDto dto);
 

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java

@@ -132,8 +132,8 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
     }
 
     @Override
-    public Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto, DataScope dataScope) {
-        Page<HardOrderVo> list = baseMapper.scopePageList(page, dto, dataScope);
+    public Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto) {
+        Page<HardOrderVo> list = baseMapper.scopePageList(page, dto);
         if (ObjectUtil.isNotEmpty(list.getRecords())) {
             // 用户
             List<Long> userIds = list.getRecords().stream().map(HardOrderVo::getUserId).filter(ObjectUtil::isNotEmpty).distinct().toList();