Browse Source

修改支付

master
前端-胡立永 2 days ago
parent
commit
59712fc0c4
4 changed files with 10 additions and 5 deletions
  1. +2
    -0
      .gitignore
  2. +5
    -0
      .idea/jarRepositories.xml
  3. +2
    -4
      module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java
  4. +1
    -1
      module-system/src/main/resources/application-dev.yml

+ 2
- 0
.gitignore View File

@ -0,0 +1,2 @@
target
.idea

+ 5
- 0
.idea/jarRepositories.xml View File

@ -26,5 +26,10 @@
<option name="name" value="JBoss Community repository" /> <option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" /> <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://maven.aliyun.com/repository/public" />
</remote-repository>
</component> </component>
</project> </project>

+ 2
- 4
module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java View File

@ -348,9 +348,6 @@ public class AppletOrderServiceImpl implements AppletOrderService {
BigDecimal twoMoney = commonShop.getTwoMoney().multiply(new BigDecimal(sku.getNum())); BigDecimal twoMoney = commonShop.getTwoMoney().multiply(new BigDecimal(sku.getNum()));
sku.setPid(orderId); sku.setPid(orderId);
sku.setHasChild("0"); sku.setHasChild("0");
@ -498,7 +495,8 @@ public class AppletOrderServiceImpl implements AppletOrderService {
"购买"+ "组合订单" , "购买"+ "组合订单" ,
"127.0.0.1", "127.0.0.1",
orderId, orderId,
i1,
cityOrder.getPrice().multiply(new BigDecimal(100)).intValue(),
// i1,
orderId, orderId,
hanHaiMember.getAppletOpenid(), hanHaiMember.getAppletOpenid(),
cityOrder.toString()); cityOrder.toString());


+ 1
- 1
module-system/src/main/resources/application-dev.yml View File

@ -1,5 +1,5 @@
server: server:
port: 8001
port: 8002
tomcat: tomcat:
max-swallow-size: -1 max-swallow-size: -1
error: error:


Loading…
Cancel
Save