便民服务商家管理

lidongdong

2023-10-19 4246b65b3e6c008b45623bb3627fb6e06df13246

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.controller.BaseController;
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;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
@@ -19,6 +20,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

@@ -167,7 +169,9 @@
     */
    @ApiOperation(value = "分页查询便民服务商家", response = ConvenientMerchantVO.class)
    @PostMapping("/merchant/page")
    public R pageMerchant(@RequestBody PageConvenientMerchantDTO pageConvenientMerchantDTO) {
    public R pageMerchant(@RequestBody JinhuiPageConvenientMerchantDTO pageConvenientMerchantDTO)
    {
        pageConvenientMerchantDTO.setAuditType("2");
        return jinhuiCommunityService.pageMerchant(pageConvenientMerchantDTO);
    }

@@ -318,6 +322,20 @@
    }


    /**
     * 空间预约分类分页查询
     * @param
     * @return
     */
    @ApiOperation(value = "空间预约分类分页查询", response = JinhuiInterspaceTypeVO.class)
    @GetMapping("/interspaceTypeGetList")
    public R interspaceTypeGetList(@RequestParam("pageNum") int pageNum,
                                   @RequestParam("pageSize") int pageSize)
    {
        return jinhuiCommunityService.interspaceTypeGetList(pageNum,pageSize);
    }


    /***************************************************************************************************************
     *
     *
@@ -332,12 +350,16 @@
     * @return
     */
    @ApiOperation(value = "空间预约申请分页", response = JinhuiInterspaceApplyForVO.class)
    @GetMapping("//applyFor/getList")
    @GetMapping("/applyFor/getList")
    public R applyForGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "intendantType", required = false) String intendantType,
                             @RequestParam(value = "state", required = false) String state) {
        return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType, state);
                             @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) {
        return jinhuiCommunityService.applyForGetList(pageNum, pageSize, intendantType,
                state,interspaceTime,subscribeTimeFrame,interspaceId);
    }

    /**
@@ -390,9 +412,213 @@
    }


/******************************************************************************************************************
 *
 *
 *                             金汇微心愿
 *
 *
 ******************************************************************************************************************/
    /**
     * 分页查询
     * @param
     * @return
     */
    @ApiOperation(value = "金汇微心愿列表", response = JinhuiMicroVolunteeringVO.class)
    @GetMapping("/volunteering/getList")
    public R volunteeringGetList(@RequestParam("pageNum") int pageNum,
                                 @RequestParam("pageSize") int pageSize,
                                 @RequestParam(value = "state", required = false)String state)
    {
        return jinhuiCommunityService.volunteeringGetList(pageNum,pageSize,getUserId()+"",state);
    }

    /**
     * 详情
     * @param id
     * @return
     */
    @ApiOperation(value = "金汇微心愿详情", response = JinhuiMicroVolunteeringVO.class)
    @GetMapping("/volunteering/getDetails")
    public R volunteeringGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.volunteeringGetDetails(id);
    }
    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "金汇微心愿新增")
    @PostMapping("/volunteering/addData")
    public R volunteeringAddData(@RequestBody JinhuiMicroVolunteeringVO item)
    {
        item.setUserId(getUserId()+"");
        return jinhuiCommunityService.volunteeringAddData(item);
    }

    /**
     * 编辑
     * @param item
     * @return
     */
    @ApiOperation(value = "金汇微心愿编辑")
    @PostMapping("/volunteering/editData")
    public R volunteeringEditData(@RequestBody JinhuiMicroVolunteeringVO item)
    {
        return jinhuiCommunityService.volunteeringEditData(item);
    }

    /**
     * 删除
     * @param id
     * @return
     */
    @ApiOperation(value = "金汇微心愿删除")
    @DeleteMapping("/volunteering/expurgateData")
    public R volunteeringExpurgateData(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.volunteeringExpurgateData(id);
    }


    /**
     * 分页查询
     *
     * @param
     * @return
     */
    @ApiOperation(value = "金汇微心愿分类列表", response = JinhuiMicroVolunteeringTypeVO.class)
    @GetMapping("/micro/type/getList")
    public R volunteeringTypeGetList(@RequestParam("pageNum") int pageNum,
                                     @RequestParam("pageSize") int pageSize) {
        return jinhuiCommunityService.volunteeringTypeGetList(pageNum, pageSize);
    }

    /*********************************************************************************************************
     *
     *
     *            金汇商城商品
     *
     *
     *********************************************************************************************************/
    /**
     * 分页查询
     *
     * @param
     * @return
     */
    @ApiOperation(value = "金汇商城商品列表表", response = JinhuiShoppingVO.class)
    @GetMapping("/shoppingGetList")
    public R shoppingGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "goodName", required = false) String goodName,
                             @RequestParam(value = "id", required = false) String id)
    {
        return jinhuiCommunityService.shoppingGetList(pageNum,pageSize,goodName,"1",id);
    }


    @ApiOperation(value = "金汇商城商品详情", response = JinhuiShoppingVO.class)
    @GetMapping("/shoppingGetDetails")
    public R shoppingGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.shoppingGetDetails(id);
    }



    /********************************************************************************************************
     *
     *
     *                         金汇商城商品订单
     *
     *
     ********************************************************************************************************/

    /**
     * 分页查询
     * @param
     * @return
     */
    @ApiOperation(value = "订单列表", response = JinhuiShoppingOrderVO.class)
    @GetMapping("/orderGetList")
    public R orderGetList(@RequestParam("pageNum") int pageNum,
                          @RequestParam("pageSize") int pageSize,
                          @RequestParam(value = "goodsId", required = false)String goodsId,
                          @RequestParam(value = "orderNumber", required = false)String orderNumber,
                          @RequestParam(value = "goodName", required = false)String goodName,
                          @RequestParam(value = "name", required = false)String name,
                          @RequestParam(value = "cancelType", required = false)String cancelType)
    {
        return jinhuiCommunityService.orderGetList(pageNum,pageSize,getUserId()+"",
                goodsId,orderNumber,goodName,name,cancelType);
    }

    /**
     * 分页详情
     * @param
     * @return
     */
    @ApiOperation(value = "订单详情", response = JinhuiShoppingOrderVO.class)
    @GetMapping("/orderGetDetails")
    public R orderGetDetails(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.orderGetDetails(id);
    }

    /**
     * 新增
     * @param
     * @return
     */
    @ApiOperation(value = "订单新增")
    @PostMapping("/orderAddData")
    public R orderAddData(@RequestBody JinhuiShoppingOrderVO item)
    {
        return jinhuiCommunityService.orderAddData(item);
    }

    /**
     * 取消
     * @param
     * @return
     */
    @ApiOperation(value = "订单取消")
    @GetMapping("/orderCancelOrder")
    public R orderCancelOrder(@RequestParam("orderId") String orderId)
    {
        return jinhuiCommunityService.orderCancelOrder(orderId);
    }


    /**
     * 删除
     * @param
     * @return
     */
    @ApiOperation(value = "订单删除")
    @DeleteMapping("/orderExpurgateData")
    public R orderExpurgateData(@RequestParam("id") String id)
    {
        return jinhuiCommunityService.orderExpurgateData(id);
    }


    @ApiOperation(value = "订单核销")
    @GetMapping("/orderCheck")
    public R orderEditData(@RequestParam("id") String id)
    {

        if(StringUtils.isEmpty(id))
        {
            return R.fail("订单id不能为空");
        }

        JinhuiShoppingOrderVO vo=new JinhuiShoppingOrderVO();
        vo.setId(id);
        vo.setCancelType("1");
        return jinhuiCommunityService.orderEditData(vo);
    }

}