lidongdong
2024-07-15 ed9e98f6b71bf662c045fd8e24d6ac254f624051
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.bracelet.BraceletEarlyWarningDO;
import com.panzhihua.common.model.dtos.community.PageActWorkGuideDTO;
import com.panzhihua.common.model.dtos.community.convenient.JinhuiPageConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
@@ -14,6 +15,7 @@
import com.panzhihua.common.model.vos.community.convenient.JinhuiConvenientMerchantVO;
import com.panzhihua.common.model.vos.jinhui.*;
import com.panzhihua.common.model.vos.user.SysUserNoticeVO;
import com.panzhihua.common.service.bracelet.CommunityBraceletService;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.jinhui.JinhuiCommunityService;
import com.panzhihua.common.service.user.UserService;
@@ -51,7 +53,7 @@
        comActActivityVO.setUserId(this.getLoginUserInfo().getUserId());
        comActActivityVO.setStatus(2);
        comActActivityVO.setHasPrize(0);
        comActActivityVO.setHaveIntegralReward(0);
        comActActivityVO.setHaveIntegralReward(2);
        return communityService.addActivity(comActActivityVO);
    }
@@ -534,7 +536,7 @@
    @GetMapping("/shoppingGetDetails")
    public R shoppingGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.shoppingGetDetails(id);
        return jinhuiCommunityService.shoppingGetDetails(id,getCommunityId()+"");
    }
@@ -907,4 +909,46 @@
    }
    /******************************************************************************************************************
     *
     *                                  手环处理
     *
     *****************************************************************************************************************/
    @Resource
    private CommunityBraceletService communityBraceletService;
    /**
     * 微信处理接口
     * @param braceletEarlyWarningDO
     * @return
     */
    @PostMapping("/WXdispose")
    public R  WXdispose(@RequestBody BraceletEarlyWarningDO braceletEarlyWarningDO)
    {
        if(com.panzhihua.common.utlis.StringUtils.isEmpty(braceletEarlyWarningDO.getDisposeText()))
        {
            return R.fail("处理内容不能为空");
        }
        braceletEarlyWarningDO.setDisposeType("2");
        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)
    {
        return communityBraceletService.getList(pageNum,pageSize,getCommunityId()+"",equipmentNumber,
                getUserId()+"",type,userName,phone);
    }
}