mitao
2025-05-20 179c4d64313c9b7572778da4aaaf6c6584fe457d
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -53,7 +53,7 @@
        comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
        comActActivityVO.setStatus(2);
        comActActivityVO.setHasPrize(0);
        comActActivityVO.setHaveIntegralReward(0);
        comActActivityVO.setHaveIntegralReward(2);
        return communityService.addActivity(comActActivityVO);
    }
@@ -370,9 +370,10 @@
                             @RequestParam(value = "state", required = false) String state,
                             @RequestParam(value = "interspaceTime",required = false) String interspaceTime,
                             @RequestParam(value = "subscribeTimeFrame",required = false) String subscribeTimeFrame,
                             @RequestParam(value = "interspaceId",required = false) String  interspaceId) {
                             @RequestParam(value = "interspaceId",required = false) String  interspaceId,
                             @RequestParam(value = "userId",required = false) String userId) {
        return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType,
                state,interspaceTime,subscribeTimeFrame,interspaceId);
                state,interspaceTime,subscribeTimeFrame,interspaceId,userId);
    }
    /**
@@ -536,7 +537,7 @@
    @GetMapping("/shoppingGetDetails")
    public R shoppingGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.shoppingGetDetails(id);
        return jinhuiCommunityService.shoppingGetDetails(id,getCommunityId()+"");
    }
@@ -933,19 +934,17 @@
        return communityBraceletService.WXdispose(braceletEarlyWarningDO);
    }
    /**
     * 微信我的预警数据
     * @return
     */
    @GetMapping("/braceletApi/getEarlyWarningList")
    public R getList(@RequestParam("pageNum") Integer pageNum,
              @RequestParam("pageSize") Integer pageSize,
              @RequestParam(value = "equipmentNumber",required = false)  String equipmentNumber,
              @RequestParam(value = "type",required = false)  String type,
              @RequestParam(value = "userName",required = false)  String userName,
              @RequestParam(value = "phone",required = false)  String phone)
                     @RequestParam("pageSize") Integer pageSize,
                     @RequestParam(value = "equipmentNumber",required = false)  String equipmentNumber,
                     @RequestParam(value = "type",required = false)  String type,
                     @RequestParam(value = "userName",required = false)  String userName,
                     @RequestParam(value = "phone",required = false)  String phone)
    {
        return communityBraceletService.getList(pageNum,pageSize,getCommunityId()+"",equipmentNumber,
                getUserId()+"",type,userName,phone);