便民服务商家管理

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;
@@ -168,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);
    }

@@ -479,6 +482,19 @@
    }


    /**
     * 分页查询
     *
     * @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);
    }

    /*********************************************************************************************************
     *
     *
@@ -497,10 +513,9 @@
    public R shoppingGetList(@RequestParam("pageNum") int pageNum,
                             @RequestParam("pageSize") int pageSize,
                             @RequestParam(value = "goodName", required = false) String goodName,
                             @RequestParam(value = "goodType", required = false) String goodType,
                             @RequestParam(value = "id", required = false) String id)
    {
        return jinhuiCommunityService.shoppingGetList(pageNum,pageSize,goodName,goodType,id);
        return jinhuiCommunityService.shoppingGetList(pageNum,pageSize,goodName,"1",id);
    }


@@ -512,4 +527,98 @@
    }



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

    /**
     * 分页查询
     * @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);
    }

}