From 60f77c0b66c8b640e47b5f1e7d953c65eeb4ecf6 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Fri, 9 May 2025 16:21:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/canteen/activity/OperationActivity.java | 2 +-
 .../com/bonus/canteen/service/data/DownLoadDataService.java     | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/com/bonus/canteen/activity/OperationActivity.java b/app/src/main/java/com/bonus/canteen/activity/OperationActivity.java
index 4796f77..b27aed2 100644
--- a/app/src/main/java/com/bonus/canteen/activity/OperationActivity.java
+++ b/app/src/main/java/com/bonus/canteen/activity/OperationActivity.java
@@ -488,7 +488,7 @@ public class OperationActivity extends BaseActivity<ActivityCanteenOperationBind
             orderDetailPayDTO.setOrderDate(DateTimeHelper.getNowDate());
             orderDetailPayDTO.setOrderType(1);
             orderDetailPayDTO.setFinalPrice(isKeyBoard ? bean.getPrice().multiply(new BigDecimal(100)) : new BigDecimal(cookMeetDetailInfo.getPrefPrice()));
-            orderDetailPayDTO.setDiscountPrice(isKeyBoard ? BigDecimal.ZERO : new BigDecimal(cookMeetDetailInfo.getSalePrice()).subtract(new BigDecimal(cookMeetDetailInfo.getPrefPrice())));
+            orderDetailPayDTO.setDiscountPrice(isKeyBoard ? bean.getPrice().multiply(new BigDecimal(100)) : new BigDecimal(cookMeetDetailInfo.getPrefPrice()));
             orderDetailPayDTO.setQuantity(bean.getNum().intValue());
             orderDetailPayDTO.setSalePrice(isKeyBoard ? bean.getPrice().multiply(new BigDecimal(100)) : new BigDecimal(cookMeetDetailInfo.getSalePrice()));
             orderDetailPayDTO.setSalesMode(1);
diff --git a/app/src/main/java/com/bonus/canteen/service/data/DownLoadDataService.java b/app/src/main/java/com/bonus/canteen/service/data/DownLoadDataService.java
index 6747b48..3dbf2c4 100644
--- a/app/src/main/java/com/bonus/canteen/service/data/DownLoadDataService.java
+++ b/app/src/main/java/com/bonus/canteen/service/data/DownLoadDataService.java
@@ -148,10 +148,8 @@ public class DownLoadDataService extends Service {
             case "人员信息":
                 return service.getPersonInfo(null,null,0);
             case "设备信息":
-                workConfig = new WorkConfig();
                 return service.getDeviceBase();
             case "基础参数":
-                workConfig = new WorkConfig();
                 return service.getParamSettingInfo();
             case "MQ_CONNECT":
                 return activateFaceEngine();