Merge remote-tracking branch 'origin/master'

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardChartLatitudeVo.java

@@ -0,0 +1,18 @@
+package com.bsd.pjcloud.hard.api.dto.order;
+
+import lombok.Data;
+
+@Data
+public class HardChartLatitudeVo {
+
+    /**
+     * 每天的交易量
+     */
+    private Long dayCount;
+
+    /**
+     * 每天的交易金额
+     */
+    private Long dayPrice;
+
+}

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

@@ -37,6 +37,7 @@ public class HardApiController {
     private final HardOrderService hardwareOrderService;
     private final HardOrderSyncService hardOrderSyncService;
     private final HardApiService hardApiService;
+    private final HardOrderTotalService hardOrderTotalService;
 
     @PostMapping("/bind")
     @Operation(summary = "绑定服务端设备")
@@ -114,5 +115,11 @@ public class HardApiController {
         return R.ok(hardApiService.getUserByCard(card));
     }
 
+    @GetMapping("/chart-latitude")
+    @Operation(summary = "统计每天、每周、每月、每年")
+    public R<HardChartLatitudeVo> totalChart(@RequestParam String card) {
+        return R.ok(hardApiService.totalChart(card));
+    }
+
 
 }

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

@@ -136,19 +136,17 @@ public class HardOrderController {
         dto.setIsFindCarList(false);
         PjcloudUser user = SecurityUtils.getUser();
         // 判断是否为合作超市管理员工
-        if (!hardManagerService.isSuperMarketAdmin(user)) {
-            return R.ok(new Page());
-        }
+        if (!hardManagerService.isSuperMarketAdmin(user)) return R.ok(new Page());
+        // 查询用户属于的商户
+        MchManageVo mch = mchService.getFirstMchByDeptId(user.getDeptId()).getData();
+        if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
         // 查询商户和下面的子商户
-        List<Long> mchDtoIds = dto.getMchIds();
-        if (ObjectUtil.isNotEmpty(mchDtoIds) && mchDtoIds.size() == 1) {
-            Long mchId = mchDtoIds.get(0);
-            List<MchManageVo> mchList = mchService.getByParentId(mchId).getData();
-            if (ObjectUtil.isNotEmpty(mchList)) {
-                List<Long> mchIds = mchList.stream().map(MchManageVo::getId).toList();
-                mchDtoIds.addAll(mchIds);
-                dto.setMchIds(mchDtoIds);
-            }
+        List<Long> mchDtoIds = new java.util.ArrayList<>(List.of(mch.getId()));
+        List<MchManageVo> mchList = mchService.getByParentId(mch.getId()).getData();
+        if (ObjectUtil.isNotEmpty(mchList)) {
+            List<Long> mchIds = mchList.stream().map(MchManageVo::getId).toList();
+            mchDtoIds.addAll(mchIds);
+            dto.setMchIds(mchDtoIds);
         }
         return R.ok(hardwareOrderService.appMchPageJoin(page, dto, user));
     }

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

@@ -60,7 +60,6 @@ public class HardOrderTotalController {
 
     /* ************************************* end 远程调用 end ************************************* */
 
-
     /* ************************************* start app start ************************************* */
     @Operation(summary = "app查询商户每天流水记录", description = "app查询订单列表根据权限")
     @GetMapping("/app/mch-water-day")
@@ -68,19 +67,17 @@ public class HardOrderTotalController {
         PjcloudUser user = SecurityUtils.getUser();
         dto.setIsFindCarList(false);
         // 判断是否为合作超市管理员工
-        if (!hardManagerService.isSuperMarketAdmin(user)) {
-            return R.ok(new Page());
-        }
+        if (!hardManagerService.isSuperMarketAdmin(user)) return R.ok(new Page());
+        // 查询用户属于的商户
+        MchManageVo mch = mchService.getFirstMchByDeptId(user.getDeptId()).getData();
+        if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
+        List<Long> mchDtoIds = new ArrayList<>(List.of(mch.getId()));
         // 查询商户和下面的子商户
-        List<Long> mchDtoIds = dto.getMchIds();
-        if (ObjectUtil.isNotEmpty(mchDtoIds) && mchDtoIds.size() == 1) {
-            Long mchId = mchDtoIds.get(0);
-            List<MchManageVo> mchList = mchService.getByParentId(mchId).getData();
-            if (ObjectUtil.isNotEmpty(mchList)) {
-                List<Long> mchIds = mchList.stream().map(MchManageVo::getId).toList();
-                mchDtoIds.addAll(mchIds);
-                dto.setMchIds(mchDtoIds);
-            }
+        List<MchManageVo> mchList = mchService.getByParentId(mch.getId()).getData();
+        if (ObjectUtil.isNotEmpty(mchList)) {
+            List<Long> mchIds = mchList.stream().map(MchManageVo::getId).toList();
+            mchDtoIds.addAll(mchIds);
+            dto.setMchIds(mchDtoIds);
         }
         return R.ok(hardOrderTotalService.listCsByDay(page, dto, user));
     }

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

@@ -124,10 +124,6 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
      */
     @Override
     public Page<HardOrderVo> appMchPageJoin(Page page, HardOrderDto dto, PjcloudUser user) {
-        // 查询用户属于的商户
-        MchManageVo mch = remoteMchService.getFirstMchByDeptId(user.getDeptId()).getData();
-        if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
-        dto.setMerchantId(mch.getId());
         return getSelf().pagejoin(page, dto);
     }
 

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

@@ -182,10 +182,6 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
 
     @Override
     public List<HardOrderCsVo> listCsByDay(Page page, HardOrderDto dto, PjcloudUser user) {
-        // 查询用户属于的商户
-        MchManageVo mch = remoteMchService.getFirstMchByDeptId(user.getDeptId()).getData();
-        if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
-        dto.setMerchantId(mch.getId());
         // 查询总流水
         CompletableFuture<List<HardOrderCsVo>> totalListFuture = CompletableFuture.supplyAsync(() -> {
             HardOrderDto totalDto = BeanUtil.toBean(dto, HardOrderDto.class);