后台新增商家删除

lidongdong

2023-10-20 7b19cdde83503226f3488c73a4f033e6df772f03

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

@@ -156,9 +156,8 @@
     */
    @ApiOperation(value = "删除便民服务商家")
    @DeleteMapping("/merchant/delete")
    public R deleteMerchant(@RequestParam("merchantId") String merchantId,
                            @RequestParam("operator") String operator) {
        return jinhuiCommunityService.deleteMerchant(merchantId, operator);
    public R deleteMerchant(@RequestParam("merchantId") String merchantId) {
        return jinhuiCommunityService.deleteMerchant(merchantId);
    }

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

@@ -603,4 +604,21 @@
    }


    @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");
        vo.setCancelTime(new Date());
        return jinhuiCommunityService.orderEditData(vo);
    }

}