feat:h5共富商城用户查询不了流水的问题

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

@@ -166,7 +166,7 @@ public class HardOrderController {
         // 判断是否为合作超市管理员工
         if (!hardManagerService.isSuperMarketAdmin(user)) return R.ok(new Page());
         // 查询用户属于的商户
-        MchManageVo mch = mchService.getFirstMchByDeptId(userInfo.getSysUser().getDeptId(), MerchantTypeEnum.SUPERMARKET).getData();
+        MchManageVo mch = mchService.getFirstMchByDeptId(userInfo.getSysUser().getDeptId(), List.of(MerchantTypeEnum.SUPERMARKET, MerchantTypeEnum.FARMER)).getData();
         if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
         // 查询商户和下面的子商户
         List<Long> mchDtoIds = new java.util.ArrayList<>(List.of(mch.getId()));

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

@@ -81,7 +81,7 @@ public class HardOrderTotalController {
         // 判断是否为合作超市管理员工
         if (!hardManagerService.isSuperMarketAdmin(user)) return R.ok(new Page());
         // 查询用户属于的商户
-        MchManageVo mch = mchService.getFirstMchByDeptId(userInfo.getSysUser().getDeptId(), MerchantTypeEnum.SUPERMARKET).getData();
+        MchManageVo mch = mchService.getFirstMchByDeptId(userInfo.getSysUser().getDeptId(), List.of(MerchantTypeEnum.SUPERMARKET, MerchantTypeEnum.FARMER)).getData();
         if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
         List<Long> mchDtoIds = new ArrayList<>(List.of(mch.getId()));
         // 查询商户和下面的子商户
@@ -103,7 +103,7 @@ public class HardOrderTotalController {
         // 判断是否为合作超市管理员工
         if (!hardManagerService.isSuperMarketAdmin(user)) return R.ok(new Page());
         // 查询用户属于的商户
-        MchManageVo mch = mchService.getFirstMchByDeptId(userInfo.getSysUser().getDeptId(), MerchantTypeEnum.SUPERMARKET).getData();
+        MchManageVo mch = mchService.getFirstMchByDeptId(userInfo.getSysUser().getDeptId(), List.of(MerchantTypeEnum.SUPERMARKET, MerchantTypeEnum.FARMER)).getData();
         if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
         List<Long> mchDtoIds = new ArrayList<>(List.of(mch.getId()));
         // 查询商户和下面的子商户

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

@@ -19,6 +19,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
+import java.util.List;
+
 @Validated
 @Slf4j
 @RequiredArgsConstructor
@@ -51,7 +53,7 @@ public class HardApiServiceImpl implements HardApiService {
         result.setWalletBalance(wallet.getBalance());
         result.setWalletIsFreeze(wallet.getIsFreeze());
         // 查询用户食堂信息
-        MchManageVo mchDetail = remoteMchService.getFirstMchByDeptId(user.getSysUser().getDeptId(), MerchantTypeEnum.CANTEEN).getData();
+        MchManageVo mchDetail = remoteMchService.getFirstMchByDeptId(user.getSysUser().getDeptId(), List.of(MerchantTypeEnum.CANTEEN)).getData();
         if (ObjectUtil.isNotEmpty(mchDetail)) {
             result.setCanteenId(mchDetail.getId());
         }
@@ -84,7 +86,7 @@ public class HardApiServiceImpl implements HardApiService {
         result.setWalletBalance(wallet.getBalance());
         result.setWalletIsFreeze(wallet.getIsFreeze());
         // 查询用户食堂信息
-        MchManageVo mchDetail = remoteMchService.getFirstMchByDeptId(user.getSysUser().getDeptId(), MerchantTypeEnum.CANTEEN).getData();
+        MchManageVo mchDetail = remoteMchService.getFirstMchByDeptId(user.getSysUser().getDeptId(), List.of(MerchantTypeEnum.CANTEEN)).getData();
         if (ObjectUtil.isNotEmpty(mchDetail)) {
             result.setCanteenId(mchDetail.getId());
         }

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

@@ -1103,7 +1103,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
             List<MchRuleJoinDtoVo> list = mchRuleJoinService.innerMchRoleList(mch.getId()).getData();
             if (ObjectUtil.isEmpty(list)) return extraPrice;
             // 查询用户食堂
-            MchManageVo userMch = remoteMchService.getFirstMchByDeptId(sysUser.getDeptId(), MerchantTypeEnum.CANTEEN).getData();
+            MchManageVo userMch = remoteMchService.getFirstMchByDeptId(sysUser.getDeptId(), List.of(MerchantTypeEnum.CANTEEN)).getData();
             for (MchRuleJoinDtoVo v : list) {
                 Long basePrice = v.getBasePrice();
                 Long multiple = v.getMultiple();

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/sync/HardSyncServiceImpl.java

@@ -33,8 +33,8 @@ public class HardSyncServiceImpl implements HardSyncService {
         if (ObjectUtil.isEmpty(user)) throw new RuntimeException("当前登录用户错误");
         Long deptId = user.getDeptId();
         // 查询该用户属于的超市
-        MchManageVo targetMch = remoteMchService.getFirstMchByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET).getData();
-        if (ObjectUtil.isEmpty(targetMch) || ObjectUtil.notEqual(targetMch.getTypes(), MerchantTypeEnum.SELF_SUPERMARKET.getType())) {
+        MchManageVo targetMch = remoteMchService.getFirstMchByDeptId(deptId, List.of(MerchantTypeEnum.SELF_SUPERMARKET)).getData();
+        if (ObjectUtil.isEmpty(targetMch)) {
             throw new RuntimeException("您不是超市用户,无法操作");
         }
         mqttEventService.sendSupermarket(List.of(deptId));

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/feign/RemoteMchService.java

@@ -51,5 +51,5 @@ public interface RemoteMchService {
 
     @NoToken
     @GetMapping("/mch-manage/get-first-mch-by-dept-id")
-    R<MchManageVo> getFirstMchByDeptId(@RequestParam Long deptId, @RequestParam MerchantTypeEnum mchType);
+    R<MchManageVo> getFirstMchByDeptId(@RequestParam Long deptId, @RequestParam List<MerchantTypeEnum> mchType);
 }