6.9新增登录失败冻结逻辑

liujie

2025-06-09 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/VolunteerIntegralMerchantApi.java

@@ -144,7 +144,7 @@

        if(StringUtils.isEmpty(vimVO.getState()))
        {
            return R.fail("商品上下架状态不能为空");
            vimVO.setState("1");
        }

        if(StringUtils.isEmpty(vimVO.getCommunityId()))
@@ -197,10 +197,11 @@
                     @RequestParam(value = "userName", required = false) String userName,
                     @RequestParam(value = "communityId", required = false) String communityId,
                     @RequestParam(value = "userId", required = false) String userId,
                     @RequestParam(value = "orderType", required = false) String orderType)
                     @RequestParam(value = "orderType", required = false) String orderType,
                     @RequestParam(value = "merchantId", required = false) String merchantId)
    {
        return vceService.getList(pageNum,pageSize,goodsId,orderNumber,goodsName,
                condition,userName,communityId,userId,orderType);
                condition,userName,communityId,userId,orderType,merchantId);
    }

    /**
@@ -296,4 +297,21 @@
    }



    /**
     * 社区取消订单
     * @param id
     * @return
     */
    @GetMapping("/order/communityCancellation")
    public R communityCancellation(@RequestParam("id") String id)
    {
        if(StringUtils.isEmpty(id))
        {
            return R.fail("订单id不能为空");
        }
        return vceService.communityCancellation(id);
    }


}