Merge remote-tracking branch 'origin/master'

zss

13 小时以前 118afd697fe3197236dcf0ffd6cfd39bcec2d85f

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

@@ -8,17 +8,24 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.dto.ProductRecordDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.pojo.PaymentRegistration;
import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.purchase.pojo.TicketRegistration;
import com.ruoyi.purchase.service.IPaymentRegistrationService;
import com.ruoyi.purchase.service.IProductRecordService;
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 lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.parameters.P;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -38,11 +45,15 @@
@Api(tags = "来票登记")
public class TicketRegistrationController extends BaseController {

    private final PaymentRegistrationServiceImpl paymentRegistrationServiceImpl;
    private ITicketRegistrationService ticketRegistrationService;

    private ICommonFileService commonFileService;

    private IProductRecordService productRecordService;

    @Autowired
    private IPaymentRegistrationService paymentRegistrationService;

    /**
     * 查询来票登记列表
@@ -52,6 +63,32 @@
        startPage();
        List<TicketRegistration> list = ticketRegistrationService.selectTicketRegistrationList(ticketRegistration);
        return getDataTable(list);
    }

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

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

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

    @ApiOperation("删除付款流水")
    @DeleteMapping("/delPaymentRegistration")
    public AjaxResult delPaymentRegistration(@RequestBody Long id) {
        return toAjax(paymentRegistrationService.delPaymentRegistration(id));
    }

    /**
@@ -82,11 +119,28 @@
        return toAjax(ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto));
    }


    @GetMapping("/getProductRecordById")
    public AjaxResult getProductRecordById(Long id) {
        if (id == null) {
            return AjaxResult.error("参数错误");
        }
        return AjaxResult.success(productRecordService.getProductRecordById(id));
    }

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

        return productRecordService.updateRecord(productRecordDto);
    }

    /**
     * 删除来票登记
     * 删除来票登记(来票台账)
     */
    @Log(title = "来票登记", businessType = BusinessType.DELETE)
    @Log(title = "删除来票登记(来票台账)", businessType = BusinessType.DELETE)
    @DeleteMapping("/delRegistration")
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult delRegistration(@RequestBody Long[] ids) {
        return toAjax(ticketRegistrationService.delRegistration(ids));
    }