合并分支

.gitignore

@@ -18,5 +18,5 @@ push-order-service/push-order-service.iml
 push-order-service/target/
 shopping-cart-application-service/shopping-cart-application-service.iml
 shopping-cart-application-service/target/
-order-management/order-application-service.iml
+order-management/order-management.iml
 order-management/target/

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.2.6.RELEASE</version>
+    <version>1.2.7.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -22,3 +22,4 @@
 | 1.2.4.RELEASE | 紧急需求 增加骑手电话 | 海波 | 2020-03-19 |
 | 1.2.5.RELEASE | 满额减配送费 | dingkai | 2020-03-26 |
 | 1.2.5.RELEASE | 满额减配送费 | 海波 | 2020-03-26 |
+| 1.2.7.RELEASE | 判断优化 | 丁凯 | 2020-04-03 |
\ No newline at end of file

call-back-service/pom.xml

@@ -100,21 +100,18 @@
         </dependency>
         <!-- promtheus  -->
         <dependency>
-            <groupId>io.prometheus</groupId>
-            <artifactId>simpleclient_spring_boot</artifactId>
-            <version>0.8.0</version>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-
         <dependency>
             <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-            <version>0.12.0.RELEASE</version>
+            <artifactId>micrometer-spring-legacy</artifactId>
+            <version>1.1.2</version>
         </dependency>
-
         <dependency>
             <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-spring-legacy</artifactId>
-            <version>0.8.0.RELEASE</version>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+            <version>1.1.2</version>
         </dependency>
     </dependencies>
     <build>

call-back-service/src/main/java/cn/freemud/ApiApplication.java

@@ -14,8 +14,6 @@ package cn.freemud;
 
 import cn.freemud.utils.LogTreadLocal;
 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.pbe.PooledPBEStringEncryptor;
 import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
@@ -45,8 +43,6 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
 @EnableAspectJAutoProxy
 @ComponentScan({"cn.freemud","com.freemud"})
 @EnableFeignClients
-@EnablePrometheusEndpoint
-@EnableSpringBootMetricsCollector
 @EnableAutoConfiguration
 public class ApiApplication {
     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
 env=pro
 apollo.bootstrap.enabled=true
 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

order-application-service/pom.xml

@@ -337,26 +337,6 @@
             <artifactId>apm-toolkit-logback-1.x</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>
     <build>
         <plugins>

order-application-service/src/main/java/cn/freemud/OrderApplication.java

@@ -15,8 +15,6 @@ package cn.freemud;
 import cn.freemud.core.db.DataSourcesConfig;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 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.pbe.PooledPBEStringEncryptor;
 import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
@@ -45,8 +43,6 @@ import tk.mybatis.spring.annotation.MapperScan;
 @MapperScan({"cn.freemud.*.dao","com.freemud.sdk.api.assortment.orderdistributor.mapper","com.freemud.api.assortment.datamanager.manager",
                 "com.freemud.api.assortment.datamanager.queue.dao","com.freemud.api.assortment.datamanager.rbac.dao","com.freemud.api.assortment.datamanager.queue.entity"})
 @EnableFeignClients({"cn.freemud.service.thirdparty","com.freemud.sdk.api.assortment.message"})
-@EnablePrometheusEndpoint
-@EnableSpringBootMetricsCollector
 @EnableAutoConfiguration
 public class OrderApplication {
     public static void main(String[] args) {

order-application-service/src/main/java/cn/freemud/controller/AgentController.java

@@ -13,6 +13,16 @@ public class AgentController {
     public String reportDefault() {
         return HealthUtil.healthCheck();
     }
+
+    /**
+     * 提供给健康检查使用
+     * 不可删除，如删除后会造成健康检查失败而重启服务
+     * @return
+     */
+    @RequestMapping(value = "/health/check")
+    public String checkHealth() {
+        return "ok";
+    }
 }
 
 

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

@@ -150,7 +150,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         if (DeliveryStatus.DELIVERYERROR.getCode() != request.getDeliveryStatus()) return false;
         if (StringUtils.isBlank(request.getRemark())) return false;
 
-        List<String> abnormalDesc = Lists.newArrayList("顾客更改配送地址", "顾客更改收货地址");
+        List<String> abnormalDesc = Lists.newArrayList("顾客更改配送地址", "顾客更改收货地址", "顾客更改送货地址");
         for (String str : abnormalDesc) {
             if (request.getRemark().contains(str)) {
                 log.info("isDeliveryAbnormalAndCustomerChangedAddress.true of {}", JSONObject.toJSONString(request));

order-application-service/src/main/resources/application-dev.properties

@@ -9,5 +9,3 @@ env=dev
 apollo.cluster=default
 apollo.bootstrap.enabled=true
 apollo.bootstrap.namespaces=micro_progeram_commons,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
 env=pro
 apollo.bootstrap.enabled=true
 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
 env=pro
 apollo.cluster=default
 apollo.bootstrap.enabled=true
-apollo.bootstrap.namespaces=micro_progeram_commons,order_service
+apollo.bootstrap.namespaces=order_service,micro_progeram_commons
 
 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
 apollo.cluster=default
 apollo.bootstrap.enabled=true
 apollo.bootstrap.namespaces=order_service,micro_progeram_commons
-
-eureka.client.enabled=true
\ No newline at end of file

order-application-service/src/main/resources/application.properties

@@ -11,7 +11,6 @@ apollo.cluster=default
 apollo.bootstrap.enabled=true
 apollo.bootstrap.namespaces=micro_progeram_commons,order_service
 
-eureka.client.enabled=false
 #-Dapollo.configService=http://172.81.231.147
 
 endpoints.metrics.enabled=true

shopping-cart-application-service/pom.xml

@@ -291,35 +291,6 @@
             <artifactId>apm-toolkit-logback-1.x</artifactId>
         </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>
     <build>
         <plugins>

shopping-cart-application-service/src/main/java/cn/freemud/ShoppingCartApplication.java

@@ -15,8 +15,6 @@ package cn.freemud;
 import cn.freemud.core.db.DataSourcesConfig;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 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.pbe.PooledPBEStringEncryptor;
 import org.jasypt.encryption.pbe.config.SimpleStringPBEConfig;
@@ -48,8 +46,6 @@ import tk.mybatis.spring.annotation.MapperScan;
         "com.freemud.api.assortment.datamanager.manager"})
 @EnableFeignClients
 @EnableAsync
-@EnablePrometheusEndpoint
-@EnableSpringBootMetricsCollector
 public class ShoppingCartApplication {
     public static void main(String[] args) {
         SpringApplication.run(ShoppingCartApplication.class, args);

shopping-cart-application-service/src/main/java/cn/freemud/controller/AgentController.java

@@ -13,6 +13,16 @@ public class AgentController {
     public String reportDefault() {
         return HealthUtil.healthCheck();
     }
+
+    /**
+     * 提供给健康检查使用
+     * 不可删除，如删除后会造成健康检查失败而重启服务
+     * @return
+     */
+    @RequestMapping(value = "/health/check")
+    public String checkHealth() {
+        return "ok";
+    }
 }
 
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -1368,7 +1368,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             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 = shoppingCartGoodsResponseVo.getDiscountDeliveryAmount().intValue();
             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
 env=pro
 apollo.bootstrap.enabled=true
 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

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
 env=pro
 apollo.cluster=default
 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