From e90c4e36223ed822db57c6acc142d11dffd28666 Mon Sep 17 00:00:00 2001 From: yang_shj Date: Thu, 3 Mar 2022 16:11:37 +0800 Subject: [PATCH] =?UTF-8?q?feat=200=20=E6=94=AF=E4=BB=98=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/base/springcloud/bo/OrderBO.java | 2 +- .../com/base/springcloud/controller/PaymentController.java | 4 ++-- .../java/com/base/springcloud/service/imp/BillServiceImp.java | 2 +- .../main/resources/com/base/payment/mapper/SaleBillMapper.xml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/payment-base-app/src/main/java/com/base/springcloud/bo/OrderBO.java b/payment-base-app/src/main/java/com/base/springcloud/bo/OrderBO.java index e43578e..b2430be 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/bo/OrderBO.java +++ b/payment-base-app/src/main/java/com/base/springcloud/bo/OrderBO.java @@ -11,7 +11,7 @@ import java.io.Serializable; public class OrderBO extends MchConfigEntity implements Serializable { // 销售单据号 - private String billNo; + private String billId; // 销售单 private SaleBill saleBill; diff --git a/payment-base-app/src/main/java/com/base/springcloud/controller/PaymentController.java b/payment-base-app/src/main/java/com/base/springcloud/controller/PaymentController.java index 29ccbfc..16f6296 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/controller/PaymentController.java +++ b/payment-base-app/src/main/java/com/base/springcloud/controller/PaymentController.java @@ -33,10 +33,10 @@ public class PaymentController { @ApiOperation(value = "native下单", notes = "微信native下单") @GetMapping("/nativePlaceOrder") - public ReportResult nativePlaceOrder(@RequestParam String salesBill) { + public ReportResult nativePlaceOrder(@RequestParam String salesBillId) { String mchId = "888027018000004"; OrderBO orderBO = new OrderBO(); - orderBO.setBillNo(salesBill); + orderBO.setBillId(salesBillId); orderBO.setMchId(mchId); String codeUrl = paymentService.placeOrder(orderBO); List array = new ArrayList<>(); diff --git a/payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java b/payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java index be6cad8..084acce 100644 --- a/payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java +++ b/payment-base-app/src/main/java/com/base/springcloud/service/imp/BillServiceImp.java @@ -23,7 +23,7 @@ public class BillServiceImp implements BillService { @Override public void billCheck(OrderBO orderBO) { SaleBill saleBill = new SaleBill(); - saleBill.setBillNo(orderBO.getBillNo()); + saleBill.setId(orderBO.getBillId()); SaleBill queryResult = saleBillMapper.queryBillInfo(saleBill); if(!Optional.ofNullable(queryResult).isPresent()){ saleBill.setTotalAmount(new BigDecimal(1)); diff --git a/payment-base-app/src/main/resources/com/base/payment/mapper/SaleBillMapper.xml b/payment-base-app/src/main/resources/com/base/payment/mapper/SaleBillMapper.xml index 6c18103..4863ea5 100644 --- a/payment-base-app/src/main/resources/com/base/payment/mapper/SaleBillMapper.xml +++ b/payment-base-app/src/main/resources/com/base/payment/mapper/SaleBillMapper.xml @@ -534,6 +534,6 @@ select from stk_io_bill - where bill_no = #{billNo,jdbcType=VARCHAR} + where id = #{Id,jdbcType=VARCHAR} \ No newline at end of file