西藏国投
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2025-04-21 2e1039b373bf2ad12f44e5fda0574cfd053b08ae 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java


@@ -3,11 +3,9 @@




import com.ruoyi.common.basic.PageInfo;


import com.ruoyi.common.core.domain.R;


import com.ruoyi.common.exception.ServiceException;


import com.ruoyi.common.utils.SecurityUtils;


import com.ruoyi.common.utils.StringUtils;


import com.ruoyi.system.dto.*;


import com.ruoyi.system.model.TBill;


import com.ruoyi.system.model.TBillConfirm;


import com.ruoyi.system.model.TBillDetail;


import com.ruoyi.system.model.TContract;


@@ -19,11 +17,17 @@


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.security.access.prepost.PreAuthorize;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.bind.annotation.GetMapping;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RequestParam;


import org.springframework.web.bind.annotation.RestController;




import javax.validation.constraints.NotEmpty;


import java.math.BigDecimal;


import java.util.List;


import java.util.Objects;




/**


 * <p>


@@ -49,6 +53,8 @@




    @Autowired


    TContractService contractService;


    @Autowired


    TPayOrderService tPayOrderService;




    @PreAuthorize("@ss.hasPermi('bill:list')")


    @PostMapping("list")


@@ -78,8 +84,15 @@


    @PreAuthorize("@ss.hasPermi('bill:list:addRent')")


    @PostMapping("add")


    @ApiOperation("新增账单")


    public R add(@Validated @RequestBody TbillSaveDto bill){


        bill.setBusinessDeptId(SecurityUtils.getBusinessDeptId());


    public R<PageInfo<TBillDto>> add(@Validated @RequestBody TbillSaveDto bill){


        String businessDeptId = SecurityUtils.getBusinessDeptId();


        if (SecurityUtils.getBusinessDeptId().equals("0")) {


            TContract contract = contractService.getById(bill.getContractId());


            if (Objects.nonNull(contract)) {


                businessDeptId = contract.getBusinessDeptId();


            }


        }


        bill.setBusinessDeptId(businessDeptId);


        tBillService.saveBill(bill);


        return R.ok();


    }


@@ -159,7 +172,12 @@


    }








    @ApiOperation(value = "创建支付订单、二维码支付")


    @PostMapping("makeOrder")


    public R<MakeOrderResp> makeOrder(@Validated @RequestBody MakeOrderDto dto){


        MakeOrderResp resp = tPayOrderService.makeOrder(dto);


        return R.ok(resp);


    }