Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS

bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ar/ArReceiptController.java

@@ -1,106 +0,0 @@
-package com.ruoyi.web.controller.ar;
-
-import java.util.List;
-import jakarta.validation.Valid;
-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.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.ar.domain.ArReceipt;
-import com.ruoyi.ar.domain.ArReceiptWriteoff;
-import com.ruoyi.ar.domain.vo.ArBillActionRequest;
-import com.ruoyi.ar.domain.vo.ArReceiptQuery;
-import com.ruoyi.ar.domain.vo.ArReceiptWriteoffRequest;
-import com.ruoyi.ar.service.IArReceiptService;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.uuid.IdUtils;
-
-/** 应收收款与核销管理。 */
-@RestController
-@RequestMapping("/ar/receipt")
-@Validated
-public class ArReceiptController extends BaseController
-{
-    @Autowired
-    private IArReceiptService receiptService;
-
-    @PreAuthorize("@ss.hasPermi('ar:receipt:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(ArReceiptQuery query)
-    {
-        startPage();
-        return getDataTable(receiptService.selectReceiptList(query));
-    }
-
-    @PreAuthorize("@ss.hasPermi('ar:receipt:list')")
-    @GetMapping("/{receiptId}/writeoffs")
-    public AjaxResult writeoffs(@PathVariable Long receiptId)
-    {
-        return success(receiptService.selectWriteoffs(receiptId));
-    }
-
-    @Log(title = "应收收款", businessType = BusinessType.INSERT)
-    @PreAuthorize("@ss.hasPermi('ar:receipt:add')")
-    @PostMapping
-    public AjaxResult add(@Valid @RequestBody ArReceipt receipt,
-        @RequestHeader(value = "X-Request-Id", required = false) String headerRequestId)
-    {
-        String requestId = requestId(headerRequestId);
-        return success(receiptService.registerReceipt(receipt, getUsername(), requestId)).put("request_id", requestId);
-    }
-
-    @Log(title = "应收收款", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('ar:receipt:cancel')")
-    @PutMapping("/{receiptId}/cancel")
-    public AjaxResult cancelReceipt(@PathVariable Long receiptId, @RequestBody(required = false) ArBillActionRequest request,
-        @RequestHeader(value = "X-Request-Id", required = false) String headerRequestId)
-    {
-        String requestId = requestId(request == null ? null : request.getRequestId(), headerRequestId);
-        receiptService.cancelReceipt(receiptId, request == null ? null : request.getRemark(), getUsername(), requestId);
-        return success().put("request_id", requestId);
-    }
-
-    @Log(title = "应收收款核销", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('ar:receipt:writeoff')")
-    @PostMapping("/writeoff")
-    public AjaxResult writeoff(@Valid @RequestBody ArReceiptWriteoffRequest request,
-        @RequestHeader(value = "X-Request-Id", required = false) String headerRequestId)
-    {
-        String requestId = StringUtils.isNotEmpty(request.getRequestId()) ? request.getRequestId() : requestId(headerRequestId);
-        List<ArReceiptWriteoff> rows = receiptService.writeoff(request, getUsername(), requestId);
-        return success(rows).put("request_id", requestId);
-    }
-
-    @Log(title = "应收收款核销", businessType = BusinessType.UPDATE)
-    @PreAuthorize("@ss.hasPermi('ar:receipt:cancel')")
-    @PutMapping("/writeoff/{writeoffId}/cancel")
-    public AjaxResult cancel(@PathVariable Long writeoffId, @RequestBody(required = false) ArBillActionRequest request,
-        @RequestHeader(value = "X-Request-Id", required = false) String headerRequestId)
-    {
-        String requestId = requestId(request == null ? null : request.getRequestId(), headerRequestId);
-        receiptService.cancelWriteoff(writeoffId, request == null ? null : request.getRemark(), getUsername(), requestId);
-        return success().put("request_id", requestId);
-    }
-
-    private String requestId(String headerRequestId)
-    {
-        return StringUtils.isNotEmpty(headerRequestId) ? headerRequestId : IdUtils.fastSimpleUUID();
-    }
-
-    private String requestId(String bodyRequestId, String headerRequestId)
-    {
-        return StringUtils.isNotEmpty(bodyRequestId) ? bodyRequestId : requestId(headerRequestId);
-    }
-}

bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerBillController.java

@@ -13,8 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.ar.domain.ArBalanceWriteoff;
 import com.ruoyi.ar.service.IArBalanceWriteoffService;
-import com.ruoyi.ar.service.IArBillService;
-import com.ruoyi.ar.domain.vo.ArBillQuery;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -22,7 +20,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 
 /**
- * 客户余额核销应收账单 / 账单只读查询 Controller
+ * 客户余额核销应收账单 Controller（账单查看统一走应收管理-应收账单页面）
  *
  * @author ruoyi
  * @date 2026-09-16
@@ -34,9 +32,6 @@ public class CustomerBillController extends BaseController
     @Autowired
     private IArBalanceWriteoffService balanceWriteoffService;
 
-    @Autowired
-    private IArBillService billService;
-
     /**
      * 查询客户可核销账单（已确认/部分核销，未核销额大于0）
      */
@@ -87,25 +82,4 @@ public class CustomerBillController extends BaseController
         balanceWriteoffService.cancelWriteoff(writeoffId, body == null ? null : body.getCancelRemark());
         return success();
     }
-
-    /**
-     * 账单查看：分页查询应收账单（只读，供客户侧账单查看页使用）
-     */
-    @PreAuthorize("@ss.hasPermi('customer:bill:list')")
-    @GetMapping("/list")
-    public TableDataInfo billList(ArBillQuery query)
-    {
-        startPage();
-        return getDataTable(billService.selectArBillList(query));
-    }
-
-    /**
-     * 账单查看：账单详情（含订单明细/费用明细）
-     */
-    @PreAuthorize("@ss.hasPermi('customer:bill:query')")
-    @GetMapping("/{arBillId}")
-    public AjaxResult billInfo(@PathVariable("arBillId") Long arBillId)
-    {
-        return success(billService.selectArBillById(arBillId));
-    }
 }

bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/customer/customermoney/CustomerMoneyController.java

@@ -17,6 +17,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.customer.customermoney.domain.CustomerBalanceFlow;
+import com.ruoyi.customer.customermoney.domain.CustomerCreditApply;
 import com.ruoyi.customer.customermoney.domain.CustomerCreditFlow;
 import com.ruoyi.customer.customermoney.domain.CustomerReceipt;
 import com.ruoyi.customer.customermoney.service.ICustomerMoneyService;
@@ -136,15 +137,76 @@ public class CustomerMoneyController extends BaseController
     }
 
     /**
-     * 调整客户额度（信用额度/临时额度），调整过程留额度流水
+     * 提交额度调整申请（信用额度/临时额度），申请待审批通过后才真正调整额度
      */
     @PreAuthorize("@ss.hasPermi('customer:credit:adjust')")
-    @Log(title = "客户额度调整", businessType = BusinessType.UPDATE)
-    @PostMapping("/credit/adjust")
-    public AjaxResult adjustCredit(@RequestBody CustomerCreditFlow flow)
+    @Log(title = "客户额度调整申请", businessType = BusinessType.INSERT)
+    @PostMapping("/credit/apply")
+    public AjaxResult applyCredit(@RequestBody CustomerCreditApply apply)
     {
-        flow.setCreateBy(getUsername());
-        flow.setOperatorId(getUserId());
-        return toAjax(customerMoneyService.adjustCredit(flow));
+        apply.setCreateBy(getUsername());
+        return toAjax(customerMoneyService.applyCreditAdjust(apply));
+    }
+
+    /**
+     * 查询额度调整申请列表
+     */
+    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:list')")
+    @GetMapping("/credit/apply/list")
+    public TableDataInfo creditApplyList(CustomerCreditApply query)
+    {
+        if (query == null || query.getCustomerId() == null || query.getCustomerId() == 0L) {
+            return getDataTable(Collections.emptyList());
+        }
+        startPage();
+        List<CustomerCreditApply> list = customerMoneyService.selectCreditApplyList(query);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询额度调整申请详情
+     */
+    @PreAuthorize("@ss.hasPermi('customersupplier:customerinfo:list')")
+    @GetMapping("/credit/apply/{applyId}")
+    public AjaxResult getCreditApply(@PathVariable("applyId") Long applyId)
+    {
+        return success(customerMoneyService.selectCreditApplyById(applyId));
+    }
+
+    /**
+     * 审批通过额度调整申请：通过后调整账户额度并生成额度流水
+     */
+    @PreAuthorize("@ss.hasPermi('customer:credit:approve')")
+    @Log(title = "客户额度调整审批", businessType = BusinessType.UPDATE)
+    @PutMapping("/credit/apply/approve/{applyId}")
+    public AjaxResult approveCreditApply(@PathVariable("applyId") Long applyId,
+                                         @RequestBody(required = false) CustomerCreditApply body)
+    {
+        String remark = body != null ? body.getApproveRemark() : null;
+        return toAjax(customerMoneyService.approveCreditApply(applyId, remark));
+    }
+
+    /**
+     * 驳回额度调整申请（驳回原因必填）
+     */
+    @PreAuthorize("@ss.hasPermi('customer:credit:approve')")
+    @Log(title = "客户额度调整驳回", businessType = BusinessType.UPDATE)
+    @PutMapping("/credit/apply/reject/{applyId}")
+    public AjaxResult rejectCreditApply(@PathVariable("applyId") Long applyId,
+                                        @RequestBody CustomerCreditApply body)
+    {
+        String reason = body != null ? body.getApproveRemark() : null;
+        return toAjax(customerMoneyService.rejectCreditApply(applyId, reason));
+    }
+
+    /**
+     * 撤销待审批的额度调整申请
+     */
+    @PreAuthorize("@ss.hasPermi('customer:credit:adjust')")
+    @Log(title = "客户额度调整撤销", businessType = BusinessType.UPDATE)
+    @PutMapping("/credit/apply/cancel/{applyId}")
+    public AjaxResult cancelCreditApply(@PathVariable("applyId") Long applyId)
+    {
+        return toAjax(customerMoneyService.cancelCreditApply(applyId));
     }
 }