后台新增商家删除

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);
    }

    /**

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/jinhui/JinhuiCommunityService.java

@@ -211,7 +211,7 @@
     * @return
     */
    @DeleteMapping("/jinhuiMerchant/delete")
    public R deleteMerchant(@RequestParam("merchantId") String merchantId, @RequestParam("operator") String operator);
    public R deleteMerchant(@RequestParam("merchantId") String merchantId);

    /**
     * 分页查询便民服务商家 运营后台

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/JinhuiAppi.java

@@ -779,6 +779,19 @@
    }


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


    @ApiOperation(value = "便民服务商家审核")
    @GetMapping("/merchant/audit")
    public R merchantAudit(@RequestParam("auditType") String auditType,

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/api/JinhuiMerchantApi.java

@@ -37,9 +37,8 @@
     * @return
     */
    @DeleteMapping("/delete")
    public R deleteMerchant(@RequestParam("merchantId") String merchantId,
                            @RequestParam("operator") String operator) {
        return jinhuiConvenientMerchantService.deleteMerchant(merchantId, operator);
    public R deleteMerchant(@RequestParam("merchantId") String merchantId) {
        return jinhuiConvenientMerchantService.deleteMerchant(merchantId);
    }



 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/dao/JinhuiConvenientMerchantDao.java

@@ -33,7 +33,7 @@
     * @param operator
     * @return
     */
    int deleteMerchantById(@Param("merchantId") String merchantId, @Param("operator") String operator);
    int deleteMerchantById(@Param("merchantId") String merchantId);

    /**
     * 分页查询便民服务商家 运营后台

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/JinhuiConvenientMerchantService.java

@@ -24,7 +24,7 @@
     * @param operator 操作人员
     * @return
     */
    R deleteMerchant(String merchantId, String operator);
    R deleteMerchant(String merchantId);

    /**
     * 分页查询便民服务商家

 springcloud_k8s_panzhihuazhihuishequ/service_jinhui_community/src/main/java/com/panzhihua/service_jinhui_community/service/impl/JinhuiConvenientMerchantServiceImpl.java

@@ -31,8 +31,8 @@


    @Override
    public R deleteMerchant(String merchantId, String operator) {
        int result = this.baseMapper.deleteMerchantById(merchantId, operator);
    public R deleteMerchant(String merchantId) {
        int result = this.baseMapper.deleteMerchantById(merchantId);
        if (result > 0) {
            return R.ok();
        }