Merge branch 'feature/1.9.25-微商城紧急-20200603-dingkai' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
#	call-back-service/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1036,6 +1036,7 @@ public class OrderSdkAdapter {
         data.setOrderSettlementDetailList(orderInfoReqs.getOrderSettlementDetailList());
         //费用信息
         data.setOrderCostDetailList(orderInfoReqs.getOrderCostDetailList());
+        data.setExpressChannelName(orderInfoReqs.getExpressChannelName());
         //发票信息
         data.setOrderInvoice(orderInfoReqs.getOrderInvoice());
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -1426,10 +1426,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 || OrderType.RESERVED_DINE_IN.equals(baseQueryOrderRequest.getOrderType())
                 || OrderType.RESERVED_SELF_PICKUP.equals(baseQueryOrderRequest.getOrderType())){
             //外卖预约单
-//            if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) &&
-//                    configuration != null && configuration.getDeliveryOrderWarnTime() != null){
-//                orderWarnTime = configuration.getDeliveryOrderWarnTime();
-//            }
+            if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) &&
+                    configuration != null && configuration.getDeliveryOrderWarnTime() != null){
+                orderWarnTime = configuration.getDeliveryOrderWarnTime();
+            }
             OrderTaskReq orderTask = new OrderTaskReq();
             orderTask.setTaskType(3);
             Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(baseQueryOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), -getMinTime(orderWarnTime));

assortment-shoppingcart-sdk/pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.9.3-SNAPSHOT</version>
+            <version>3.2.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-application-service/src/main/java/cn/freemud/entities/dto/wechat/GetTokenResponseDto.java

@@ -18,14 +18,15 @@ import lombok.Data;
 @Data
 public class GetTokenResponseDto {
 
-    private String statusCode;
-    private String msg;
+    private String code;
+    private String message;
+    private String subMsg;
     private String ver;
-    private ResultBean data;
+    private ResultBean result;
 
     @Data
     public static class ResultBean {
-        private String appid;
+        private String miniAppId;
         private String accessToken;
     }
 

order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java

@@ -123,8 +123,6 @@ public class MallOrderServiceImpl implements MallOrderService {
     @Autowired
     private OrderSdkService orderSdkService;
     @Autowired
-    private WechatApplicationServiceClient wechatApplicationServiceClient;
-    @Autowired
     private EcologyAdminApplicationClient ecologyAdminApplicationClient;
 
     /**
@@ -655,12 +653,12 @@ public class MallOrderServiceImpl implements MallOrderService {
             GetAuthorizerRequestDto getAuthorizerRequestDto = new GetAuthorizerRequestDto();
             getAuthorizerRequestDto.setPartnerId(orderBean.getCompanyId());
             getAuthorizerRequestDto.setAuthorizerAppid(orderExtInfoDto.getAppid());
-            GetTokenResponseDto getTokenResponseDto = wechatApplicationServiceClient.getToken(getAuthorizerRequestDto);
-            if(getTokenResponseDto == null || getTokenResponseDto.getData() == null) {
+            GetTokenResponseDto getTokenResponseDto = ecologyAdminApplicationClient.getAuthorizerAccessToken(getAuthorizerRequestDto);
+            if(getTokenResponseDto == null || getTokenResponseDto.getResult() == null || StringUtils.isBlank(getTokenResponseDto.getResult().getAccessToken())) {
                 LogUtil.info(trackingNo, "createDelivery getToken fail", gson.toJson(getAuthorizerRequestDto), gson.toJson(getTokenResponseDto));
                 return false;
             }
-            String accessToken = getTokenResponseDto.getData().getAccessToken();
+            String accessToken = getTokenResponseDto.getResult().getAccessToken();
             CreateDeliveryOrderRequestDto createDeliveryOrderRequestDto = deliveryAdapter.convertToWeixinDeliveryOrderRequestDto(orderBean, storeResponse, accessToken, deliveryNotifyUrl);
             CreateDeliveryOrderResponseDto createDeliveryOrderResponseDto = deliveryService.deliveryOrderAdd(createDeliveryOrderRequestDto, trackingNo);
             /**

order-application-service/src/main/java/cn/freemud/service/thirdparty/EcologyAdminApplicationClient.java

@@ -3,6 +3,8 @@ package cn.freemud.service.thirdparty;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.ecology.VirtualBindStoreResponse;
 import cn.freemud.entities.dto.ecology.VirtualStoreRequest;
+import cn.freemud.entities.dto.wechat.GetAuthorizerRequestDto;
+import cn.freemud.entities.dto.wechat.GetTokenResponseDto;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,4 +24,8 @@ public interface EcologyAdminApplicationClient {
      */
     @PostMapping(value = "ecology/api/app/info/getBuyBindVirtualStore", produces = MediaType.APPLICATION_JSON_VALUE ,consumes = MediaType.APPLICATION_JSON_VALUE )
     BaseResponse<VirtualBindStoreResponse> getBuyBindVirtualStore(@RequestBody VirtualStoreRequest virtualStoreRequest);
+
+    @PostMapping(value = "/ecology/api/getAuthorizerAccessToken")
+    GetTokenResponseDto getAuthorizerAccessToken(@RequestBody GetAuthorizerRequestDto request);
+
 }

order-management/pom.xml

@@ -52,7 +52,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.8.6-SNAPSHOT</version>
+            <version>1.8.10-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

shopping-cart-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>2.9.3-SNAPSHOT</version>
+            <version>3.2.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -864,7 +864,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             ProductBeanDTO productBean;
             if ((productBean = productBeanMap.get(sendGoods.getGoodsId())) != null) {
                 // 设置加价购商品原价
-                sendGoods.setOriginalPrice(productBean.getOriginalPrice());
+                sendGoods.setOriginalPrice(productBean.getFinalPrice());
             } else {
                 throw new ServiceException(ResponseResult.SHOPPING_CART_SENDGOODS_NOT_EXIST);
             }

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

+package cn.freemud.service.strategy;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: DefaultDiscountStrategy
+ * @Package cn.freemud.service.strategy
+ * @Description:
+ * @author: shuhu.hou
+ * @date: 2020/6/2 16:12
+ * @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Component
+public class DefaultDiscountStrategy {
+}