部分代码提交

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/bill/BillController.java

+package org.dromara.server.controller.bill;
+
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.ys.common.PageInfo;
+import org.dromara.common.ys.model.res.bill.*;
+import org.dromara.common.ys.service.IBillService;
+import org.dromara.server.base.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/bill/ys")
+public class BillController extends BaseController {
+
+    private final IBillService billService;
+
+    /**
+     * 对帐单查询
+     */
+    @GetMapping("/queryBill")
+    public R<QueryBillModel> queryBill(@RequestBody org.dromara.common.ys.model.req.bill.QueryBillModel model) {
+        return R.ok(billService.queryBill(getUserId(), model));
+    }
+
+    /**
+     * 交易明细查询
+     */
+    @GetMapping("/queryBillAll")
+    public R<QueryBillAllModel> queryBillAll(@RequestBody org.dromara.common.ys.model.req.bill.QueryBillAllModel model) {
+        return R.ok(billService.queryBillAll(getUserId(), model));
+    }
+
+    /**
+     * 账户消费往来账明细 分页查询
+     */
+    @GetMapping("/accountDetail")
+    public R<PageInfo<AccountDetailBeanModel>> accountDetail(@RequestBody org.dromara.common.ys.model.req.bill.AccountDetailModel model) {
+        return R.ok(billService.accountDetail(getUserId(), model));
+    }
+
+    /**
+     * 机票消费清单明细 分页查询
+     */
+    @GetMapping("/consTicketList")
+    public R<ConsTicketListModel> consTicketList(@RequestBody org.dromara.common.ys.model.req.bill.ConsTicketListModel model) {
+        return R.ok(billService.consTicketList(getUserId(), model));
+    }
+
+    /**
+     * 账单推送
+     */
+    @PostMapping("/pushStatement")
+    public R<TravelBillPushStatementModel> pushStatement(@RequestBody org.dromara.common.ys.model.req.bill.TravelBillPushStatementModel model) {
+        return R.ok(billService.pushStatement(getUserId(), model));
+    }
+
+    /**
+     * 获取账单核对结果
+     */
+    @GetMapping("/getCompareResult")
+    public R<TravelBillGetCompareResultModel> getCompareResult(@RequestBody org.dromara.common.ys.model.req.bill.TravelBillGetCompareResultModel model) {
+        return R.ok(billService.getCompareResult(getUserId(), model));
+    }
+
+    /**
+     * 新增或新增报销记录
+     */
+    @PostMapping("/editBxjl")
+    public R<EditBxjlModel> editBxjl(@RequestBody org.dromara.common.ys.model.req.bill.EditBxjlModel model) {
+        return R.ok(billService.editBxjl(getUserId(), model));
+    }
+
+    /**
+     * 确认对账单
+     */
+    @PostMapping("/confirmRecon")
+    public R<Void> confirmRecon(@RequestBody org.dromara.common.ys.model.req.bill.ConfirmReconModel model) {
+        billService.confirmRecon(getUserId(), model);
+        return R.ok(null);
+    }
+}

ruoyi-modules/ruoyi-server/src/main/java/org/dromara/server/controller/qz/QzController.java

+package org.dromara.server.controller.qz;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.ys.common.PageInfo;
+import org.dromara.common.ys.model.req.qz.*;
+import org.dromara.common.ys.model.res.qz.GetAssociatDetailModel;
+import org.dromara.common.ys.model.res.qz.GetProdDetailModel;
+import org.dromara.common.ys.model.res.qz.QzOrderGetDetailModel;
+import org.dromara.common.ys.model.res.qz.*;
+import org.dromara.common.ys.service.IQzService;
+import org.dromara.server.base.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wenhe
+ */
+@Validated
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/qz/ys")
+public class QzController extends BaseController {
+
+    private final IQzService qzService;
+
+    /**
+     * 产品列表查询
+     */
+    @GetMapping("/queryProdList")
+    public R<PageInfo<VisaProdBeanModel>> queryProdList(@RequestBody QueryProdListModel model) {
+        return R.ok(qzService.queryProdList(getUserId(), model));
+    }
+
+    /**
+     * 产品详情获取
+     */
+    @GetMapping("/getProdDetail")
+    public R<GetProdDetailModel> getProdDetail(@RequestBody org.dromara.common.ys.model.req.qz.GetProdDetailModel model) {
+        return R.ok(qzService.getProdDetail(getUserId(), model));
+    }
+
+    /**
+     * 常用资料列表
+     */
+    @GetMapping("/queryAssociation")
+    public R<PageInfo<AssocitionBeanModel>> queryAssociation(@RequestBody QueryAssociationModel model) {
+        return R.ok(qzService.queryAssociation(getUserId(), model));
+    }
+
+    /**
+     * 常用资料详情
+     */
+    @GetMapping("/getAssociatDetail")
+    public R<GetAssociatDetailModel> getAssociatDetail(@RequestBody org.dromara.common.ys.model.req.qz.GetAssociatDetailModel model) {
+        return R.ok(qzService.getAssociatDetail(getUserId(), model));
+    }
+
+    /**
+     * 预约动态信息
+     */
+    @GetMapping("/queryNewAppointment")
+    public R<List<NewAppointmentBeanModel>> queryNewAppointment(@RequestBody QueryNewAppointmentModel model) {
+        return R.ok(qzService.queryNewAppointment(getUserId(), model));
+    }
+
+    /**
+     * 下单预定
+     */
+    @PostMapping("/bookOrder")
+    public R<Void> bookOrder(@RequestBody QzOrderBookOrderModel model) {
+        qzService.bookOrder(getUserId(), model);
+        return R.ok(null);
+    }
+
+    /**
+     * 订单列表
+     */
+    @GetMapping("/queryList")
+    public R<PageInfo<OrderListBeanModel>> queryList(@RequestBody QzOrderQueryListModel model) {
+        return R.ok(qzService.queryList(getUserId(), model));
+    }
+
+    /**
+     * 取消订单
+     */
+    @PostMapping("/cancelOrder")
+    public R<Void> cancelOrder(@RequestBody QzOrderCancelOrderModel model) {
+        qzService.cancelOrder(getUserId(), model);
+        return R.ok(null);
+    }
+
+    /**
+     * 订单详情
+     */
+    @GetMapping("/getDetail")
+    public R<QzOrderGetDetailModel> getDetail(@RequestBody org.dromara.common.ys.model.req.qz.QzOrderGetDetailModel model) {
+        return R.ok(qzService.getDetail(getUserId(), model));
+    }
+}