Merge remote-tracking branch 'origin/xin' into pxb

彭雪彬

2025-07-14 c1d20b425b10e8ba59f102dd1ab413055883eed0

 oying-system/src/main/java/com/oying/modules/system/rest/MerchantController.java

@@ -4,18 +4,22 @@
import com.oying.modules.system.domain.Merchant;
import com.oying.modules.system.service.MerchantService;
import com.oying.modules.system.domain.dto.MerchantsQueryCriteria;
import com.oying.utils.R;
import lombok.RequiredArgsConstructor;

import java.util.List;

import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.*;

import java.io.IOException;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.oying.utils.PageResult;

/**
* @author lixin
@@ -39,9 +43,9 @@
    @GetMapping
    @ApiOperation("查询商户信息")
    @PreAuthorize("@el.check('merchant:list')")
    public ResponseEntity<PageResult<Merchant>> queryMerchants(MerchantsQueryCriteria criteria){
    public ResponseEntity<Object> queryMerchants(MerchantsQueryCriteria criteria) {
        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
        return new ResponseEntity<>(merchantService.queryAll(criteria,page),HttpStatus.OK);
        return new ResponseEntity<>(R.success(merchantService.queryAll(criteria, page)), HttpStatus.OK);
    }

    @PostMapping
@@ -50,7 +54,7 @@
    @PreAuthorize("@el.check('merchant:add')")
    public ResponseEntity<Object> createMerchants(@Validated @RequestBody Merchant resources){
        merchantService.create(resources);
        return new ResponseEntity<>(HttpStatus.CREATED);
        return new ResponseEntity<>(R.success(), HttpStatus.CREATED);
    }

    @PutMapping
@@ -59,7 +63,7 @@
    @PreAuthorize("@el.check('merchant:edit')")
    public ResponseEntity<Object> updateMerchants(@Validated @RequestBody Merchant resources){
        merchantService.update(resources);
        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
        return new ResponseEntity<>(R.success(), HttpStatus.NO_CONTENT);
    }

    @DeleteMapping
@@ -68,6 +72,6 @@
    @PreAuthorize("@el.check('merchant:del')")
    public ResponseEntity<Object> deleteMerchants(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
        merchantService.deleteAll(ids);
        return new ResponseEntity<>(HttpStatus.OK);
        return new ResponseEntity<>(R.success(), HttpStatus.OK);
    }
}