canrd-main / canrud-mall-services · Commits

Commit 57770b99d47381590c717f834b1896022c5ed9f0

Authored by boyang
2 parents 4b1fc2ed d47531d0
build: skipped

Merge branch 'bugfix-0523price' into 'master' 

Bugfix 0523price



See merge request !2
Inline Side-by-side
Showing 3 changed files with 6 additions and 3 deletions
admin/src/main/resources/application-prod.yml
  View file @57770b9
@@ -59,11 +59,11 @@ spring: @@ -59,11 +59,11 @@ spring:
59 testOnReturn: true 59 testOnReturn: true
60 password: 123456 60 password: 123456
61 time-between-eviction-runs-millis: 1000 61 time-between-eviction-runs-millis: 1000
62 - url: jdbc:mysql://159.75.211.11:3306/canrd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true 62 + url: jdbc:mysql://127.0.0.1:3306/canrd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true
63 username: root 63 username: root
64 redis: 64 redis:
65 database: 3 65 database: 3
66 - host: 159.75.211.11 66 + host: 127.0.0.1
67 lettuce: 67 lettuce:
68 pool: 68 pool:
69 max-active: 2000 69 max-active: 2000
admin/src/main/resources/application.yml
  View file @57770b9
@@ -3,4 +3,4 @@ server: @@ -3,4 +3,4 @@ server:
3 3
4 spring: 4 spring:
5 profiles: 5 profiles:
6 - active: test  
7 \ No newline at end of file 6 \ No newline at end of file
  7 + active: prod
8 \ No newline at end of file 8 \ No newline at end of file
shop/src/main/java/com/canrd/shop/service/impl/ProductServiceImpl.java
  View file @57770b9
@@ -411,6 +411,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, ProductDO> im @@ -411,6 +411,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, ProductDO> im
411 if (Objects.nonNull(pId2ttMinPriceMap.get(product.getId()))){ 411 if (Objects.nonNull(pId2ttMinPriceMap.get(product.getId()))){
412 BigDecimal originMinPrice = pId2ttMinPriceMap.get(product.getId()) 412 BigDecimal originMinPrice = pId2ttMinPriceMap.get(product.getId())
413 .divide(new BigDecimal("0.7"), 2, RoundingMode.HALF_UP) 413 .divide(new BigDecimal("0.7"), 2, RoundingMode.HALF_UP)
  414 + .divide(new BigDecimal("0.7"), 2, RoundingMode.HALF_UP)
414 .divide(new BigDecimal("0.5"), 2, RoundingMode.HALF_UP) 415 .divide(new BigDecimal("0.5"), 2, RoundingMode.HALF_UP)
415 .multiply(new BigDecimal("0.148")) 416 .multiply(new BigDecimal("0.148"))
416 .setScale(2, RoundingMode.HALF_UP); 417 .setScale(2, RoundingMode.HALF_UP);
@@ -423,6 +424,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, ProductDO> im @@ -423,6 +424,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, ProductDO> im
423 if (Objects.nonNull(pId3ttMaxPriceMap.get(product.getId()))){ 424 if (Objects.nonNull(pId3ttMaxPriceMap.get(product.getId()))){
424 BigDecimal originMaxPrice = pId3ttMaxPriceMap.get(product.getId()) 425 BigDecimal originMaxPrice = pId3ttMaxPriceMap.get(product.getId())
425 .divide(new BigDecimal("0.7"), 2, RoundingMode.HALF_UP) 426 .divide(new BigDecimal("0.7"), 2, RoundingMode.HALF_UP)
  427 + .divide(new BigDecimal("0.7"), 2, RoundingMode.HALF_UP)
426 .divide(new BigDecimal("0.5"), 2, RoundingMode.HALF_UP) 428 .divide(new BigDecimal("0.5"), 2, RoundingMode.HALF_UP)
427 .multiply(new BigDecimal("0.148")) 429 .multiply(new BigDecimal("0.148"))
428 .setScale(2, RoundingMode.HALF_UP); 430 .setScale(2, RoundingMode.HALF_UP);
@@ -582,6 +584,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, ProductDO> im @@ -582,6 +584,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, ProductDO> im
582 } 584 }
583 BigDecimal originPrice = price 585 BigDecimal originPrice = price
584 .divide(new BigDecimal("0.7"), 2, RoundingMode.HALF_UP) 586 .divide(new BigDecimal("0.7"), 2, RoundingMode.HALF_UP)
  587 + .divide(new BigDecimal("0.7"), 2, RoundingMode.HALF_UP)
585 .divide(new BigDecimal("0.5"), 2, RoundingMode.HALF_UP) 588 .divide(new BigDecimal("0.5"), 2, RoundingMode.HALF_UP)
586 .multiply(new BigDecimal("0.148")) 589 .multiply(new BigDecimal("0.148"))
587 .setScale(2, RoundingMode.HALF_UP); 590 .setScale(2, RoundingMode.HALF_UP);