From 9e9aa93f009c9c92eace9cbeac1b87795ea8064b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com>
Date: Wed, 30 Aug 2023 15:46:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E6=AC=BE=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/pluss/platform/controller/MerchantOrderController.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
index d310d9c..7180fcf 100644
--- a/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
+++ b/pluss-api-page/src/main/java/cn/pluss/platform/controller/MerchantOrderController.java
@@ -556,7 +556,6 @@ public class MerchantOrderController {
         merchantOrder.setStoreName("尖愁");
         merchantOrder.setTransDt(new Date());
         merchantOrder.setCreateDt(new Date());
-        merchantOrder.setAisleSwitch("1");
         merchantOrder.setStatus("1");
         //BigDecimal e=new BigDecimal(merchantOrder.getConsumeFee()).subtract(new BigDecimal(merchantOrder.getConsumeFee()).multiply(new BigDecimal("0.0038")).setScale(2,BigDecimal.ROUND_DOWN)).setScale(2,BigDecimal.ROUND_DOWN);
 
@@ -565,7 +564,7 @@ public class MerchantOrderController {
         BigDecimal bigDecimal1 = new BigDecimal(String.valueOf(merchantOrder.getConsumeFee()));
         BigDecimal subtract1 = bigDecimal1.subtract(bigDecimal);
         merchantOrder.setEnterFee(subtract1.doubleValue());
-        merchantOrder.setAisleSwitch("0");
+        merchantOrder.setAisleSwitch("1");
         merchantOrder.setRate(new BigDecimal("38.00"));
         merchantOrder.setSettlementType(1);
         merchantOrder.setChannelRate(new BigDecimal("21.00"));