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: