Skip to content

O
order-group
Commit 9a7161ac by ping.wu
Options

Merge branches 'develop' and 'feature/20200407_储值卡空指针修改_wuping' of… 

Merge branches 'develop' and 'feature/20200407_储值卡空指针修改_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	.gitignore
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/resources/application-dev.properties
#	order-application-service/src/main/resources/application.properties
parents 55a0b53b 44ecdb1e
Showing with 43 additions and 67 deletions
.gitignore
...@@ -20,3 +20,5 @@ shopping-cart-application-service/shopping-cart-application-service.iml ...@@ -20,3 +20,5 @@ shopping-cart-application-service/shopping-cart-application-service.iml
shopping-cart-application-service/target/ shopping-cart-application-service/target/
order-management/order-management.iml order-management/order-management.iml
order-management/target/ order-management/target/
order-management/order-management.iml
order-management/target/
assortment-ordercenter-sdk/readme.md
...@@ -23,3 +23,4 @@ ...@@ -23,3 +23,4 @@
| 1.2.5.RELEASE | 满额减配送费 | 海波 | 2020-03-26 | | 1.2.5.RELEASE | 满额减配送费 | 海波 | 2020-03-26 |
| 1.3.1-SNAPSHOT | 判断优化 | 丁凯 | 2020-03-27 | | 1.3.1-SNAPSHOT | 判断优化 | 丁凯 | 2020-03-27 |
| 1.4.1-SNAPSHOT | 增加延时队列配置 | 海波 | 2020-04-07 | | 1.4.1-SNAPSHOT | 增加延时队列配置 | 海波 | 2020-04-07 |
| 1.2.7.RELEASE | 判断优化 | 丁凯 | 2020-04-03 |
\ No newline at end of file
call-back-service/pom.xml
...@@ -100,21 +100,18 @@ ...@@ -100,21 +100,18 @@
</dependency> </dependency>
<!-- promtheus --> <!-- promtheus -->
<dependency> <dependency>
<groupId>io.prometheus</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>simpleclient_spring_boot</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
<version>0.8.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId> <artifactId>micrometer-spring-legacy</artifactId>
<version>0.12.0.RELEASE</version> <version>1.1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.micrometer</groupId> <groupId>io.micrometer</groupId>
<artifactId>micrometer-spring-legacy</artifactId> <artifactId>micrometer-registry-prometheus</artifactId>
<version>0.8.0.RELEASE</version> <version>1.1.2</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
......
call-back-service/src/main/java/cn/freemud/ApiApplication.java
...@@ -14,8 +14,6 @@ package cn.freemud; ...@@ -14,8 +14,6 @@ package cn.freemud;
import cn.freemud.utils.LogTreadLocal; import cn.freemud.utils.LogTreadLocal;
import feign.RequestInterceptor; import feign.RequestInterceptor;
import io.prometheus.client.spring.boot.EnablePrometheusEndpoint;
import io.prometheus.client.spring.boot.EnableSpringBootMetricsCollector;
import org.jasypt.encryption.StringEncryptor; import org.jasypt.encryption.StringEncryptor;
import org.jasypt.encryption.pbe.PooledPBEStringEncryptor; import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
...@@ -45,8 +43,6 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; ...@@ -45,8 +43,6 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
@EnableAspectJAutoProxy @EnableAspectJAutoProxy
@ComponentScan({"cn.freemud","com.freemud"}) @ComponentScan({"cn.freemud","com.freemud"})
@EnableFeignClients @EnableFeignClients
@EnablePrometheusEndpoint
@EnableSpringBootMetricsCollector
@EnableAutoConfiguration @EnableAutoConfiguration
public class ApiApplication { public class ApiApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
call-back-service/src/main/resources/application-pre-release.properties
...@@ -8,4 +8,4 @@ apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080 ...@@ -8,4 +8,4 @@ apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080
env=pro env=pro
apollo.bootstrap.enabled=true apollo.bootstrap.enabled=true
apollo.cluster=pre-release apollo.cluster=pre-release
apollo.bootstrap.namespaces=micro_progeram_commons,i_callback_service apollo.bootstrap.namespaces=i_callback_service,micro_progeram_commons
\ No newline at end of file \ No newline at end of file
order-application-service/src/main/java/cn/freemud/controller/AgentController.java
...@@ -13,6 +13,16 @@ public class AgentController { ...@@ -13,6 +13,16 @@ public class AgentController {
public String reportDefault() { public String reportDefault() {
return HealthUtil.healthCheck(); return HealthUtil.healthCheck();
} }
/**
* 提供给健康检查使用
* 不可删除，如删除后会造成健康检查失败而重启服务
* @return
*/
@RequestMapping(value = "/health/check")
public String checkHealth() {
return "ok";
}
} }
order-application-service/src/main/resources/application-dev.properties
...@@ -9,5 +9,3 @@ env=dev ...@@ -9,5 +9,3 @@ env=dev
apollo.cluster=default apollo.cluster=default
apollo.bootstrap.enabled=true apollo.bootstrap.enabled=true
apollo.bootstrap.namespaces=order_service apollo.bootstrap.namespaces=order_service
eureka.client.enabled=true
\ No newline at end of file
order-application-service/src/main/resources/application-pre-release.properties
...@@ -8,6 +8,4 @@ apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080 ...@@ -8,6 +8,4 @@ apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080
env=pro env=pro
apollo.bootstrap.enabled=true apollo.bootstrap.enabled=true
apollo.cluster=pre-release apollo.cluster=pre-release
apollo.bootstrap.namespaces=micro_progeram_commons,order_service apollo.bootstrap.namespaces=order_service,micro_progeram_commons
\ No newline at end of file
eureka.client.enabled=true
\ No newline at end of file
order-application-service/src/main/resources/application-pro.properties
...@@ -9,6 +9,6 @@ apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080 ...@@ -9,6 +9,6 @@ apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080
env=pro env=pro
apollo.cluster=default apollo.cluster=default
apollo.bootstrap.enabled=true apollo.bootstrap.enabled=true
apollo.bootstrap.namespaces=micro_progeram_commons,order_service apollo.bootstrap.namespaces=order_service,micro_progeram_commons
eureka.client.enabled=true eureka.client.enabled=true
\ No newline at end of file
order-application-service/src/main/resources/application-qa.properties
...@@ -10,5 +10,3 @@ env=uat ...@@ -10,5 +10,3 @@ env=uat
apollo.cluster=default apollo.cluster=default
apollo.bootstrap.enabled=true apollo.bootstrap.enabled=true
apollo.bootstrap.namespaces=micro_progeram_commons,order_service apollo.bootstrap.namespaces=micro_progeram_commons,order_service
eureka.client.enabled=true
\ No newline at end of file
shopping-cart-application-service/pom.xml
...@@ -291,35 +291,6 @@ ...@@ -291,35 +291,6 @@
<artifactId>apm-toolkit-logback-1.x</artifactId> <artifactId>apm-toolkit-logback-1.x</artifactId>
</dependency> </dependency>
<!-- promtheus -->
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-spring-legacy</artifactId>
</dependency>
<!-- promtheus -->
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_spring_boot</artifactId>
<version>0.8.0</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<version>0.12.0.RELEASE</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-spring-legacy</artifactId>
<version>0.8.0.RELEASE</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
......
shopping-cart-application-service/src/main/java/cn/freemud/ShoppingCartApplication.java
...@@ -15,8 +15,6 @@ package cn.freemud; ...@@ -15,8 +15,6 @@ package cn.freemud;
import cn.freemud.core.db.DataSourcesConfig; import cn.freemud.core.db.DataSourcesConfig;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import feign.RequestInterceptor; import feign.RequestInterceptor;
import io.prometheus.client.spring.boot.EnablePrometheusEndpoint;
import io.prometheus.client.spring.boot.EnableSpringBootMetricsCollector;
import org.jasypt.encryption.StringEncryptor; import org.jasypt.encryption.StringEncryptor;
import org.jasypt.encryption.pbe.PooledPBEStringEncryptor; import org.jasypt.encryption.pbe.PooledPBEStringEncryptor;
import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig; import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
...@@ -48,8 +46,6 @@ import tk.mybatis.spring.annotation.MapperScan; ...@@ -48,8 +46,6 @@ import tk.mybatis.spring.annotation.MapperScan;
"com.freemud.api.assortment.datamanager.manager"}) "com.freemud.api.assortment.datamanager.manager"})
@EnableFeignClients @EnableFeignClients
@EnableAsync @EnableAsync
@EnablePrometheusEndpoint
@EnableSpringBootMetricsCollector
public class ShoppingCartApplication { public class ShoppingCartApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(ShoppingCartApplication.class, args); SpringApplication.run(ShoppingCartApplication.class, args);
......
shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
...@@ -353,7 +353,6 @@ public class ShoppingCartConvertAdapter { ...@@ -353,7 +353,6 @@ public class ShoppingCartConvertAdapter {
productCombox.setSkuId(vo.getSkuId()); productCombox.setSkuId(vo.getSkuId());
productCombox.setQty(vo.getQty()); productCombox.setQty(vo.getQty());
productCombox.setExtra(vo.getExtra()); productCombox.setExtra(vo.getExtra());
productCombox.setProductGroupId(vo.getProductGroupId());
productComboList.add(productCombox); productComboList.add(productCombox);
} }
} }
...@@ -364,7 +363,7 @@ public class ShoppingCartConvertAdapter { ...@@ -364,7 +363,7 @@ public class ShoppingCartConvertAdapter {
productCombox.setSkuId(vo.getSkuId()); productCombox.setSkuId(vo.getSkuId());
productCombox.setQty(vo.getQty()); productCombox.setQty(vo.getQty());
productCombox.setExtra(vo.getExtra()); productCombox.setExtra(vo.getExtra());
productCombox.setProductGroupId(vo.getProductGroupId()); productCombox.setProductGroupId(StringUtils.isEmpty(vo.getProductGroupId())?null: Long.parseLong(vo.getProductGroupId()));
productGroupList.add(productCombox); productGroupList.add(productCombox);
} }
} }
......
shopping-cart-application-service/src/main/java/cn/freemud/controller/AgentController.java
...@@ -13,6 +13,16 @@ public class AgentController { ...@@ -13,6 +13,16 @@ public class AgentController {
public String reportDefault() { public String reportDefault() {
return HealthUtil.healthCheck(); return HealthUtil.healthCheck();
} }
/**
* 提供给健康检查使用
* 不可删除，如删除后会造成健康检查失败而重启服务
* @return
*/
@RequestMapping(value = "/health/check")
public String checkHealth() {
return "ok";
}
} }
shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ComboxGoodsRequestVo.java
...@@ -24,7 +24,7 @@ public class ComboxGoodsRequestVo { ...@@ -24,7 +24,7 @@ public class ComboxGoodsRequestVo {
/** /**
* 商品组Id * 商品组Id
*/ */
private Long productGroupId; private String productGroupId;
/** /**
* 商品额外的属性 * 商品额外的属性
*/ */
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
...@@ -1392,7 +1392,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService { ...@@ -1392,7 +1392,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
throw new ServiceException(ResponseResult.USER_SVC_CARD_ERROR); throw new ServiceException(ResponseResult.USER_SVC_CARD_ERROR);
} }
//获取实际配送费 //获取实际配送费
if (StringUtils.isNotBlank(receiveId)) { if (StringUtils.isNotBlank(receiveId) && shoppingCartGoodsResponseVo.getDiscountDeliveryAmount() != null) {
// Integer deliveryAmount = getDeliveryAmount(receiveId, partnerId, storeId); // Integer deliveryAmount = getDeliveryAmount(receiveId, partnerId, storeId);
Integer deliveryAmount = shoppingCartGoodsResponseVo.getDiscountDeliveryAmount().intValue(); Integer deliveryAmount = shoppingCartGoodsResponseVo.getDiscountDeliveryAmount().intValue();
orderAmount += deliveryAmount; orderAmount += deliveryAmount;
......
shopping-cart-application-service/src/main/resources/application-pre-release.properties
...@@ -8,4 +8,4 @@ apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080 ...@@ -8,4 +8,4 @@ apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080
env=pro env=pro
apollo.bootstrap.enabled=true apollo.bootstrap.enabled=true
apollo.cluster=pre-release apollo.cluster=pre-release
apollo.bootstrap.namespaces=micro_progeram_commons,shopping_cart apollo.bootstrap.namespaces=shopping_cart,micro_progeram_commons
\ No newline at end of file \ No newline at end of file
shopping-cart-application-service/src/main/resources/application-pro.properties
...@@ -9,4 +9,4 @@ apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080 ...@@ -9,4 +9,4 @@ apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080
env=pro env=pro
apollo.cluster=default apollo.cluster=default
apollo.bootstrap.enabled=true apollo.bootstrap.enabled=true
apollo.bootstrap.namespaces=micro_progeram_commons,shopping_cart apollo.bootstrap.namespaces=shopping_cart,micro_progeram_commons
\ No newline at end of file \ 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