Skip to content

O
order-group
Commit e1848982 by 徐康
Options

Merge branch 'feature/20201209_xukang_麦咖啡p4v2' into qa 

# Conflicts:
#	shopping-cart-application-service/src/main/resources/application.properties
parents 3d72bbd8 a3bf7fec
Showing with 5 additions and 3 deletions
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
...@@ -1635,12 +1635,14 @@ public class ShoppingCartMCoffeeServiceImpl { ...@@ -1635,12 +1635,14 @@ public class ShoppingCartMCoffeeServiceImpl {
if(i != size-1) { if(i != size-1) {
allCartGoodsList.remove(i); allCartGoodsList.remove(i);
allCartGoodsList.add(cartGoods); allCartGoodsList.add(cartGoods);
i--; break;
} }
} }
} }
} }
log.info(JSON.toJSONString(allCartGoodsList));
return allCartGoodsList; return allCartGoodsList;
} }
......
shopping-cart-application-service/src/main/resources/application.properties
...@@ -21,5 +21,4 @@ management.endpoints.web.exposure.include=prometheus,info,health,shutdown ...@@ -21,5 +21,4 @@ management.endpoints.web.exposure.include=prometheus,info,health,shutdown
management.metrics.tags.application=${spring.application.name} management.metrics.tags.application=${spring.application.name}
management.endpoint.shutdown.enabled=true management.endpoint.shutdown.enabled=true
management.security.enabled=false management.security.enabled=false
management.health.rabbit.enabled=false management.health.rabbit.enabled=false
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment