Merge branch 'feature/1.9.24-fix-mall-20200522-dingkai' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/pom.xml
#	assortment-shoppingcart-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java
#	order-application-service/src/main/java/cn/freemud/service/AppOrderService.java
#	order-application-service/src/main/java/cn/freemud/service/OrderAdapterService.java
#	order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
#	shopping-cart-application-service/pom.xml

call-back-service/src/main/java/cn/freemud/service/impl/ToolsServiceImpl.java

@@ -79,7 +79,7 @@ public class ToolsServiceImpl implements ToolsService {
             for (OrderInfoReqs reqs : response.getResult()) {
                 Header header = new Header("report", "call-back-service-api",
                         OrderCallBackConfig.INVOICE_ROUTE_KEY, OrderCallBackConfig.INVOICE_QUEUE);
-
+                reqs.setPickUpGoodsNo("2020"+reqs.getPickUpGoodsNo());
                 MQMessage<String> message = new MQMessage<>(header, JSON.toJSONString(reqs));
                 mqService.convertAndSend(OrderCallBackConfig.TOPIC_EXCHANGE_NAME, OrderCallBackConfig.INVOICE_ROUTE_KEY, message);
             }

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

@@ -170,8 +170,7 @@ public class CheckMallOrder {
         requestDto.setPremiumExchangeActivity(createOrderVo.getPremiumExchangeActivity());
         cn.freemud.base.entity.BaseResponse<ShoppingCartGoodsDto> apportionResponse = shoppingCartClient.getShoppingCartGoodsApportionNew(requestDto);
         if (!ObjectUtils.equals(ResponseCodeConstant.RESPONSE_SUCCESS_STR, apportionResponse.getCode())) {
-            ResponseResult responseResult = ResponseResult.getResponseResult(apportionResponse.getCode());
-            throw new ServiceException(responseResult != null ? responseResult : ResponseResult.SHOPPING_CART_GETINFO_ERROR );
+            throw new ServiceException(ResponseResult.SHOPPING_CART_GETINFO_ERROR);
         }
         if (apportionResponse.getResult() == null || CollectionUtils.isEmpty(apportionResponse.getResult().getProducts())) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_GETINFO_INVAILD);

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

@@ -359,8 +359,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
         String userId = userLoginInfoDto.getMemberId();
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
         String appId = shoppingCartInfoRequestVo.getAppId();
-        String storeId = this.getBindMallShopId(appId);
-        shoppingCartInfoRequestVo.setShopId(storeId);
+        String storeId = shoppingCartInfoRequestVo.getShopId();
 
         List<ShoppingCartInfoRequestVo.SendGoods> sendGoodsList = shoppingCartInfoRequestVo.getSendGoods();