lidongdong
2023-10-19 4246b65b3e6c008b45623bb3627fb6e06df13246
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/JinHuiCommnuityApi.java
@@ -169,7 +169,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 +605,20 @@
    }
    @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);
    }
}