Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of…

Merge branches 'develop' and 'feature/20200226_支付宝模板消息_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

assortment-ordercenter-sdk/readme.md

@@ -26,4 +26,8 @@
 | 1.2.0-SNAPSHOT| 订单查询返回orderType字段 | 侯书虎 | 2020-02-12 |
 | 1.2.1-SNAPSHOT| 开放平台创建订单修改 | 姜海波 | 2020-02-17 |
 | 1.2.2-SNAPSHOT| 开放平台创建订单修改 | 姜海波 | 2020-02-21 |
-| 1.2.3-SNAPSHOT| 重量计算 | 丁凯 | 2020-02-26 |
+| 1.2.3-SNAPSHOT| 重量计算 | 丁凯 | 2020-02-26 |
\ No newline at end of file
+| 1.1.6-SNAPSHOT| 1.9.11商品组  | 胡超 | 2020-02-05 |
+| 1.1.7.RELEASE| 1.9.11商品组  | 胡超 | 2020-02-13 |
+| 1.1.9.RELEASE| pos渠道  | 丁凯 | 2020-02-22 |
+| 1.2.0.RELEASE| 开放平台创建订单  | 姜海波 | 2020-02-24 |
\ No newline at end of file

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/entities/OrderExtInfoDTO.java

@@ -19,6 +19,9 @@ public class OrderExtInfoDTO {
 
     private  String prepayId;
 
+    //支付宝小程序订单特定模板消息需要
+    private  String formId;
+
     private String accessToken;
     /**
      * 到期时间

call-back-service/pom.xml

@@ -98,7 +98,24 @@
             <artifactId>apollo-client</artifactId>
             <version>1.4.0</version>
         </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>

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

@@ -14,6 +14,8 @@ 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;
@@ -43,6 +45,8 @@ 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/java/cn/freemud/amp/service/OrderCallBackMQService.java

@@ -128,7 +128,7 @@ public class OrderCallBackMQService {
             OrderInfoReqs orderInfoReqs = JSONObject.parseObject(body.getContent(), OrderInfoReqs.class);
             if (orderInfoReqs != null && OrderClientType.SAAS.getIndex().equals(orderInfoReqs.getOrderClient()) &&
                     ((body.getOperateType() == 0 && NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderInfoReqs.getOrderState())) ||
-                            (body.getOperateType() == 1 && NewOrderStatus.COMPLETE.getIndex().equals(orderInfoReqs.getOrderState())))) {
+                            (body.getOperateType() == 1 && NewOrderStatus.PLACE_AN_ORDER.getIndex().equals(orderInfoReqs.getOrderState())))) {
                 return orderInfoReqs;
             }
         } catch (Exception ex) {

call-back-service/src/main/resources/application.properties

@@ -8,4 +8,14 @@ app.id=SHOP_OPEN_STORE
 apollo.meta=http://212.129.229.203
 env=dev
 apollo.bootstrap.enabled=true
-apollo.bootstrap.namespaces=micro_progeram_commons,i_callback_service
+apollo.bootstrap.namespaces=micro_progeram_commons,i_callback_service
\ No newline at end of file
+
+endpoints.metrics.enabled=true
+endpoints.health.sensitive=false
+endpoints.health.enabled=true
+management.endpoint.health.show-details=always
+management.endpoints.web.base-path=/
+management.endpoints.web.exposure.include=prometheus,info,health,shutdown
+management.metrics.tags.application=${spring.application.name}
+management.endpoint.shutdown.enabled=true
+management.security.enabled=false
\ No newline at end of file

order-application-service/pom.xml

@@ -70,7 +70,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-messagepush-sdk</artifactId>
-            <version>2.5.5.RELEASE</version>
+            <version>2.6.1.RELEASE</version>
             <exclusions>
                 <exclusion>
                     <groupId>cn.freemud.commons</groupId>
@@ -337,6 +337,26 @@
             <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,6 +15,8 @@ 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;
@@ -43,6 +45,8 @@ 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/service/impl/OrderServiceImpl.java

@@ -1983,6 +1983,7 @@ public class OrderServiceImpl implements Orderservice {
         }
         // 扩展字段中存储 sessionKey
         orderExtInfoDto.setSessionKey(createOrderVo.getSessionKey());
+        orderExtInfoDto.setFormId(createOrderVo.getFormId());
         return orderExtInfoDto;
     }
 
@@ -2046,11 +2047,16 @@ public class OrderServiceImpl implements Orderservice {
 //        orderExtInfo = orderAdapter.getOrderExtInfo(orderPayResponse, orderExtInfo);
         orderExtInfo.setOpenid(orderPayResponse.getOpenId());
         String prepayId = "";
+        OrderPayResponse.PayOrderBean payOrder = orderPayResponse.getPayOrder();
         // StringUtils 依赖修改
-        if (orderPayResponse.getPayOrder() != null && !StringUtils.isEmpty(orderPayResponse.getPayOrder().getPackageX())) {
-            String[] prepayIds = orderPayResponse.getPayOrder().getPackageX().split("=");
+        if (payOrder != null && !StringUtils.isEmpty(payOrder.getPackageX())) {
+            String[] prepayIds = payOrder.getPackageX().split("=");
             prepayId = prepayIds.length > 1 ? prepayIds[1] : "";
         }
+        //支付宝保存交易流水号发送支付宝模板消息
+        if (payOrder != null && !StringUtils.isEmpty(payOrder.getAliPayOrder())) {
+            prepayId = payOrder.getAliPayOrder();
+        }
         orderExtInfo.setPrepayId(prepayId);
 
         OrderEditRequest orderEditRequest = new OrderEditRequest(orderPayResponse.getPayTransId(),

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

@@ -12,4 +12,15 @@ apollo.bootstrap.enabled=true
 apollo.bootstrap.namespaces=micro_progeram_commons,order_service
 
 eureka.client.enabled=false
-#-Dapollo.configService=http://172.81.231.147
+#-Dapollo.configService=http://172.81.231.147
\ No newline at end of file
+
+endpoints.metrics.enabled=true
+endpoints.health.sensitive=false
+endpoints.health.enabled=true
+management.endpoint.health.show-details=always
+management.endpoints.web.base-path=/
+management.endpoints.web.exposure.include=prometheus,info,health,shutdown
+management.metrics.tags.application=${spring.application.name}
+management.endpoint.shutdown.enabled=true
+management.security.enabled=false
+management.health.rabbit.enabled=false
\ No newline at end of file

order-management/src/main/java/cn/freemud/management/controller/DeliveryOrderController.java

@@ -29,6 +29,6 @@ public class DeliveryOrderController {
     @GetMapping("/delivery/create")
     public BaseResponse deliveryCreate(@RequestParam("orderCode") String orderCode
             , @RequestParam(value = "operator", required = false) String operator) {
-        return orderDeliveryService.createDelivery(orderCode);
+        return orderDeliveryService.createDelivery(orderCode, operator);
     }
 }

order-management/src/main/java/cn/freemud/management/service/OrderDeliveryService.java

@@ -15,6 +15,7 @@ import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
 import com.google.common.base.Throwables;
 import javafx.util.Pair;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -47,7 +48,7 @@ public class OrderDeliveryService {
      * @param orderCode
      * @return
      */
-    public BaseResponse createDelivery(String orderCode) {
+    public BaseResponse createDelivery(String orderCode, String operator) {
         QueryOrdersResponse.DataBean.OrderBean orderBean = orderBaseService.getByOrderCode(orderCode);
         if (null == orderBean) {
             return CommonResp.fail("订单不存在");
@@ -58,7 +59,7 @@ public class OrderDeliveryService {
             return CommonResp.success(pair.getValue());
         }
         try {
-            this.createDelivery(orderBean);
+            this.createDelivery(orderBean, operator);
         } catch (CheckException e) {
             log.error("创建配送单失败({}),trace:{}", orderCode, Throwables.getStackTraceAsString(e));
             return CommonResp.fail(e.getMessage());
@@ -72,7 +73,7 @@ public class OrderDeliveryService {
      * @param orderBean
      * @return
      */
-    public Boolean createDelivery(QueryOrdersResponse.DataBean.OrderBean orderBean) {
+    public Boolean createDelivery(QueryOrdersResponse.DataBean.OrderBean orderBean, String operator) {
         StoreInfoRequest storeInfoRequestDto = new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId());
         StoreResponse storeInfo = storeCenterService.getStoreInfo(storeInfoRequestDto, LogTreadLocal.getTrackingNo());
         if (SUCCESS != storeInfo.getStatusCode() || storeInfo.getBizVO() == null) {
@@ -83,14 +84,17 @@ public class OrderDeliveryService {
         CreateDeliveryOrderRequestDto requestDto = buildDeliveryOrderRequestDto(orderBean, storeInfo, deliveryCallBackUrl);
         CreateDeliveryOrderResponseDto deliveryResponse = deliveryService.deliveryOrderAdd(requestDto, LogTreadLocal.getTrackingNo());
 
+        if (StringUtils.isBlank(operator)) {
+            operator = "系统";
+        }
         //创建配送单失败，更新订单为异常单
         if (deliveryResponse == null || SUCCESS != deliveryResponse.getCode() || deliveryResponse.getData() == null) {
             String deliveryId = deliveryResponse != null && deliveryResponse.getData() != null ? deliveryResponse.getData().getDeliveryId() : "";
-            orderBaseService.updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, "sys");
+            orderBaseService.updateDeliveryAbnormal(orderBean.getCompanyId(), orderBean.getOid(), deliveryId, operator);
             throw new CheckException("创建配送单信息失败，配送状态更新为配送异常");
         }
         // 创建配送单成功
-        orderBaseService.updateDeliverySuccess(orderBean.getOid(), deliveryResponse.getData().getDeliveryId(), "sys");
+        orderBaseService.updateDeliverySuccess(orderBean.getOid(), deliveryResponse.getData().getDeliveryId(), operator);
         return true;
     }
 

ordercenter-sdk/readme.md

@@ -11,4 +11,5 @@
 | 1.1.1.RELEASE| 1.9.9需求打包release版本  | 丁凯 | 2020-01-08  |
 | 1.1.2.RELEASE| 农工商订单submit  | 侯书虎 | 2020-01-13  |
 | 1.1.4-SNAPSHOT| 开放平台专用创建订单接口 | 姜海波 | 2020-02-17  |
-| 1.1.5-SNAPSHOT | 优化活动订单 | 胡超 | 2020-02-10 |
+| 1.1.5-SNAPSHOT | 优化活动订单 | 胡超 | 2020-02-10 |
\ No newline at end of file
+| 1.1.3.RELEASE| 开放平台创建订单  | 姜海波 | 2020-02-24  |
\ No newline at end of file

shopping-cart-application-service/pom.xml

@@ -290,6 +290,36 @@
             <groupId>org.apache.skywalking</groupId>
             <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,6 +15,8 @@ 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;
@@ -46,6 +48,8 @@ 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/resources/application.properties

@@ -11,8 +11,16 @@ apollo.cluster=local
 apollo.bootstrap.enabled=true
 apollo.bootstrap.namespaces=micro_progeram_commons,shopping_cart
 
-management.endpoints.web.exposure.include=health,info,env,metrics,prometheus
-management.health.rabbit.enabled=false
-management.endpoints.web.base-path=/
+
+endpoints.metrics.enabled=true
+endpoints.health.sensitive=false
+endpoints.health.enabled=true
 management.endpoint.health.show-details=always
-management.metrics.tags.application=${spring.application.name}
+management.endpoints.web.base-path=/
\ No newline at end of file
+management.endpoints.web.exposure.include=prometheus,info,health,shutdown
+management.metrics.tags.application=${spring.application.name}
+management.endpoint.shutdown.enabled=true
+management.security.enabled=false
+management.health.rabbit.enabled=false
+
+