From 59712fc0c436c3d95863a9de7ffeaf6757b99583 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 18 Jun 2025 17:13:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 2 ++
.idea/jarRepositories.xml | 5 +++++
.../java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java | 6 ++----
module-system/src/main/resources/application-dev.yml | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5bd05d6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+target
+.idea
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 6833148..4c64059 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -26,5 +26,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java
index 9fe8445..ab1c305 100644
--- a/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java
+++ b/module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java
@@ -348,9 +348,6 @@ public class AppletOrderServiceImpl implements AppletOrderService {
BigDecimal twoMoney = commonShop.getTwoMoney().multiply(new BigDecimal(sku.getNum()));
-
-
-
sku.setPid(orderId);
sku.setHasChild("0");
@@ -498,7 +495,8 @@ public class AppletOrderServiceImpl implements AppletOrderService {
"购买"+ "组合订单" ,
"127.0.0.1",
orderId,
- i1,
+ cityOrder.getPrice().multiply(new BigDecimal(100)).intValue(),
+// i1,
orderId,
hanHaiMember.getAppletOpenid(),
cityOrder.toString());
diff --git a/module-system/src/main/resources/application-dev.yml b/module-system/src/main/resources/application-dev.yml
index 8afb559..d49ea09 100644
--- a/module-system/src/main/resources/application-dev.yml
+++ b/module-system/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
server:
- port: 8001
+ port: 8002
tomcat:
max-swallow-size: -1
error: