Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

2026-04-25 d34a44a1ffa778c0a95027f67d56544b0faa4930

 src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java

@@ -19,9 +19,9 @@
import com.ruoyi.purchase.service.ITicketRegistrationService;
import com.ruoyi.purchase.service.impl.PaymentRegistrationServiceImpl;
import com.ruoyi.sales.service.ICommonFileService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
@@ -43,7 +43,7 @@
@RestController
@RequestMapping("/purchase/registration")
@AllArgsConstructor
@Api(tags = "来票登记")
@Tag(name = "来票登记")
public class TicketRegistrationController extends BaseController {

    private final PaymentRegistrationServiceImpl paymentRegistrationServiceImpl;
@@ -53,7 +53,6 @@

    private IProductRecordService productRecordService;

    @Autowired
    private IPaymentRegistrationService paymentRegistrationService;

    /**
@@ -66,27 +65,27 @@
        return getDataTable(list);
    }

    @ApiOperation("根据id查询付款流水信息")
    @Operation(summary = "根据id查询付款流水信息")
    @GetMapping("/getById")
    public List<PaymentRegistrationDto> getById( Long id ) {
        return ticketRegistrationService.getPaymentRegistrationDtoById(id);
    }

    @ApiOperation("根据id查询付款流水")
    @Operation(summary = "根据id查询付款流水")
    @GetMapping("/getPaymentRegistrationById")
    public AjaxResult getPaymentRegistrationById(Long id) {
        PaymentRegistration byId = paymentRegistrationService.getById(id);
        return AjaxResult.success(byId);
    }

    @ApiOperation("修改付款流水")
    @Operation(summary = "修改付款流水")
    @PutMapping("/updatePaymentRegistration")
    @Log(title = "修改付款流水", businessType = BusinessType.UPDATE)
    public AjaxResult updatePaymentRegistration(@RequestBody PaymentRegistration paymentRegistratio) {
        return AjaxResult.success(paymentRegistrationService.updatePaymentRegistration(paymentRegistratio));
    }

    @ApiOperation("删除付款流水")
    @Operation(summary = "删除付款流水")
    @DeleteMapping("/delPaymentRegistration")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult delPaymentRegistration(@RequestBody List<Long> id) {
@@ -147,7 +146,7 @@
        return AjaxResult.success(productRecordService.getProductRecordById(productRecordDto));
    }

    @ApiModelProperty("修改来票登记")
    @Schema(description = "修改来票登记")
    @PostMapping("/updateRegistration")
    public AjaxResult updateRegistration(@RequestBody ProductRecordDto productRecordDto) {

@@ -208,7 +207,7 @@
        return ticketRegistrationService.selectTicketRegistrationListPage(page,ticketRegistration);
    }

    @ApiModelProperty("根据id查询来漂登记")
    @Schema(description = "根据id查询来漂登记")
    @GetMapping("/getPuargeById")
    public AjaxResult getPuargeById(Long id) {
        return AjaxResult.success(ticketRegistrationService.getPuargeById( id));