Merge remote-tracking branch 'origin/qa' into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java

assortment-ordercenter-sdk/pom.xml

@@ -26,7 +26,7 @@
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.1.2-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

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

@@ -234,6 +234,10 @@ public class OrderSdkAdapter {
         List<OrderCostCreateReq> orderCostCreateReqs = new ArrayList<>();
         // 更新订单商品详情信息
         originalAmount = updateOrderItemsAndSettlements(orderItemList, orderSettlementCreateReqList, orderCostCreateReqs, requestVO.getProducts(), requestVO.getAccounts(), requestVO.getCompanyId());
+        //增加总优惠记录
+        if (!CollectionUtils.isEmpty(requestVO.getAccounts())) {
+            addTotalDisaccountData(orderSettlementCreateReqList, requestVO);
+        }
         //商品信息赋值
         request.setOrderItemList(orderItemList);
         //订单原始金额，单位分
@@ -287,6 +291,24 @@ public class OrderSdkAdapter {
         return request;
     }
 
+    private void addTotalDisaccountData(List<OrderSettlementCreateReq> orderSettlementCreateReqList, BaseCreateOrderRequest requestVO) {
+        OrderSettlementCreateReq createReq = new OrderSettlementCreateReq();
+        createReq.setProductId("0");
+        createReq.setProductSeq(0);
+        createReq.setNumber(0);
+        createReq.setExternalObjectId("");
+        createReq.setSettlementType(205);
+        //商家优惠
+        createReq.setShopDiscountAmount(requestVO.getTotalDiscountAmount());
+        //结算金额
+        createReq.setSettlementAmount(requestVO.getAmount());
+        createReq.setPlatformDiscountAmount(0L);
+        //是否线上 false:不是 true:是
+        createReq.setIsOnline(true);
+        createReq.setExternalObjectName("优惠总金额");
+        orderSettlementCreateReqList.add(createReq);
+    }
+
     public com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest convent2NEWCreateMCCafeOrderRequest(BaseCreateOrderRequest requestVO) {
         com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest request = new com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest();
         request.setPartnerId(requestVO.getCompanyId());
@@ -3654,4 +3676,83 @@ public class OrderSdkAdapter {
         orderStateInfoResp.setData(info);
         return orderStateInfoResp;
     }
+
+    public CouponRequest convert2PreCheckRequest(QueryOrdersResponse.DataBean.OrderBean orderBean, List<CreateOrderAccountRequest> accounts,String openId) {
+        if (CollectionUtils.isEmpty(accounts)) {
+            return null;
+        }
+        Optional<CreateOrderAccountRequest> accountRequest = accounts.stream().filter(account -> account.getAccountType().equals(QueryOrderAccountType.COUPON) ||  account.getAccountType().equals(QueryOrderAccountType.PRODUCT_COUPON)
+                ||  account.getAccountType().equals(QueryOrderAccountType.DISCOUNT_COUPON)).findFirst();
+        if (!accountRequest.isPresent() || accountRequest.get().getPrice() == 0) {
+            return null;
+        }
+        CreateOrderAccountRequest accountBean = accountRequest.get();
+        CouponRequest couponRequest = new CouponRequest();
+        couponRequest.setReqtype(71);
+        couponRequest.setVer(Integer.valueOf(Version.VERSION_1));
+        couponRequest.setPartnerId(Integer.parseInt(orderBean.getCompanyId()));
+        ActivityChannelEnum activityChannelEnum = orderTypeEnumConvert2ActivityChannel(orderBean.getOrderType());
+        if (activityChannelEnum == null) {
+            activityChannelEnum = ActivityChannelEnum.pickup;
+        }
+        couponRequest.setChannel(activityChannelEnum.getCode());
+        couponRequest.setStation_id("-1");
+        couponRequest.setOperator_id("-1");
+        couponRequest.setStore_id(orderBean.getShopId());
+        couponRequest.setMemberId(orderBean.getUserId());
+        couponRequest.setOpenid(openId);
+        // 订单号 替换成唯一序号
+        couponRequest.setTrans_id(orderBean.getOid());
+        couponRequest.setBusiness_date(DateUtil.convert2String(new Date(), DateUtil.FORMAT_yyyyMMdd));
+        List<TransactionVO> transactions = new ArrayList<>();
+        TransactionVO couponCodeVerificationTransDto = new TransactionVO();
+        couponCodeVerificationTransDto.setCode(accountBean.getAccountId());
+        couponCodeVerificationTransDto.setOpenId(openId);
+        Integer discountPrice = accountBean.getPrice().intValue();
+        if (discountPrice != null && discountPrice < 0) {
+            discountPrice = 0 - discountPrice;
+        }
+        couponCodeVerificationTransDto.setTotalAmount(accountBean.getPrice().longValue());
+        //商品券预教研
+        List<ProductRedeemVO> products = new ArrayList<>();
+        if (QueryOrderAccountType.PRODUCT_COUPON.getCode().equals(accountBean.getAccountType().getCode())) {
+            for (int i = 0; i < orderBean.getProductList().size(); i++) {
+                QueryOrdersResponse.DataBean.OrderBean.ProductBean productBean = orderBean.getProductList().get(i);
+                String pid = StringUtils.isNotBlank(productBean.getSpecification()) ? productBean.getSpecification() : productBean.getProductId();
+                if (!org.springframework.util.CollectionUtils.isEmpty(orderBean.getProductList().get(i).getDiscountList())) {
+                    List<QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductDiscount> discounts = orderBean.getProductList().get(i).getDiscountList().stream().
+                            filter(productDiscount -> productDiscount.getDiscountId().equals(accountBean.getAccountId())).collect(Collectors.toList());
+                    for (QueryOrdersResponse.DataBean.OrderBean.ProductBean.ProductDiscount productDiscount : discounts) {
+                        if (productDiscount.getDiscountType() == null || productDiscount.getDiscountType() == 0) {
+                            continue;
+                        }
+                        ProductRedeemVO couponCodeVerificationProductDto = new ProductRedeemVO();
+                        couponCodeVerificationProductDto.setPid(pid);
+                        couponCodeVerificationProductDto.setConsume_num(productDiscount.getDiscountQty());
+                        couponCodeVerificationProductDto.setSeq(i + 1);
+                        products.add(couponCodeVerificationProductDto);
+                    }
+                }
+            }
+        }
+        if (CollectionUtils.isNotEmpty(products)) {
+            couponCodeVerificationTransDto.setProducts(products);
+        }
+        transactions.add(couponCodeVerificationTransDto);
+        couponRequest.setTransactions(transactions);
+        return couponRequest;
+    }
+
+    private ActivityChannelEnum orderTypeEnumConvert2ActivityChannel(Integer orderType) {
+        if (Objects.equals(OldOrderType.TAKE_OUT.getCode(), orderType)) {
+            return ActivityChannelEnum.delivery;
+        } else if (Objects.equals(OldOrderType.COLLECT_GOODS.getCode(), orderType) || Objects.equals(OldOrderType.EAT_IN.getCode(), orderType)) {
+            return ActivityChannelEnum.pickup;
+        }else if (Objects.equals(OldCreateOrderType.SAASMALL.getCode(), orderType)) {
+            return ActivityChannelEnum.saasmall;
+        } else {
+            return ActivityChannelEnum.pickup;
+        }
+    }
+
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/ActivityChannelEnum.java

@@ -3,7 +3,9 @@ package com.freemud.sdk.api.assortment.order.enums;
 public enum ActivityChannelEnum {
     // pickup-到店取餐 deliver-外卖
     pickup("pickup", "到店取餐"),
-    delivery("delivery", "外卖");
+    delivery("delivery", "外卖"),
+    saasmall("saasmall", "外卖");
+
 
     private String code;
 

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldCreateOrderType.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: CreateOrderType
+ * @Package cn.freemud.enums
+ * @Description:
+ * @author: liming.guo
+ * @date: 2018/7/3 13:35
+ * @version V1.0
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+package com.freemud.sdk.api.assortment.order.enums;
+
+public enum OldCreateOrderType {
+
+    TAKE_OUT(2, "外卖"),
+    COLLECT_GOODS(1, "到店"),
+    SAASMALL(3, "商城");
+
+    private Integer code;
+    private String desc;
+
+    public static OldCreateOrderType getByCode(Integer code) {
+        if (code == null) {
+            return null;
+        }
+        for (OldCreateOrderType createOrderType : values()) {
+            if (createOrderType.getCode().equals(code)) {
+                return createOrderType;
+            }
+        }
+        return null;
+    }
+
+    OldCreateOrderType(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java

@@ -179,6 +179,8 @@ public class    BaseCreateOrderRequest extends BaseConfig {
      */
     private Byte marketingType;
 
+    private Long totalDiscountAmount;
+
     @Data
     public static class DeliveryTypeInfo {
         /**

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateFatherSonOrderRequest.java

@@ -40,6 +40,8 @@ public class CreateFatherSonOrderRequest extends BaseConfig {
      */
     private String menuType;
 
+    private String openId;
+
     @Data
     public static class OrderInfo {
         /**

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderRequest.java

@@ -15,4 +15,5 @@ public class CreateOrderRequest extends BaseConfig {
      */
     MqMessageRequest mqMessageRequest;
 
+    private String openId;
 }

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

@@ -56,11 +56,13 @@ import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest;
 import com.freemud.application.sdk.api.storecenter.response.GetStoreTableResponse;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
+import com.freemud.application.sdk.api.storecenter.response.vo.GetOrgTreeListResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.application.sdk.api.structure.MessageCenterType;
 import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
 import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
 import com.freemud.sdk.api.assortment.order.adapter.*;
+import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
 import com.freemud.sdk.api.assortment.order.entities.OrderEditInfo;
 import com.freemud.sdk.api.assortment.order.enums.*;
 import com.freemud.sdk.api.assortment.order.request.order.CreateOrderRequest;
@@ -134,7 +136,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             return getCreateOrderResponse(createOrderResponse.getErrcode().toString(), createOrderResponse.getErrmsg(), null);
         }
         BaseOrderResponse baseOrderResponse = updateStockAndScore(createOrderResponse.getData(), config.getBaseCreateOrderRequest().getProducts(), config.getBaseCreateOrderRequest().getActivityUpdateStockRequest(),
-                config.getBaseCreateOrderRequest().getAccounts(), config.getMqMessageRequest(),config.getBaseCreateOrderRequest().getMenuType());
+                config.getBaseCreateOrderRequest().getAccounts(), config.getMqMessageRequest(),config.getBaseCreateOrderRequest().getMenuType(),config.getOpenId());
         if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
             return getCreateOrderResponse(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg(), null);
         }
@@ -155,7 +157,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         }
         CreateFatherSonOrderRequest.OrderInfo productOrderRequest = createFatherSonOrderRequest.getOrderInfoList().stream().filter(orderBeanTemp -> 1 == orderBeanTemp.getBizType()).collect(Collectors.toList()).get(0);
         BaseOrderResponse baseOrderResponse =updateStockAndScore(productOrderInfo.get(0), productOrderRequest.getProducts(), productOrderRequest.getActivityUpdateStockRequest(), productOrderRequest.getAccounts(),
-                createFatherSonOrderRequest.getMqMessageRequest(),createFatherSonOrderRequest.getMenuType());
+                createFatherSonOrderRequest.getMqMessageRequest(),createFatherSonOrderRequest.getMenuType(),createFatherSonOrderRequest.getOpenId());
         if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
             return CreateFatherSonOrderResponse.error(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg());
         }
@@ -175,7 +177,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     }
 
     private BaseOrderResponse updateStockAndScore(OrderBean orderBean, List<CreateOrderProductRequest> products, ActivityUpdateStockRequest updateStockRequest,
-                                                  List<CreateOrderAccountRequest> accounts, MqMessageRequest mqMessageRequest,String menuType) {
+                                                  List<CreateOrderAccountRequest> accounts, MqMessageRequest mqMessageRequest,String menuType,String openId) {
         //TODO 转换获取库存信息,扣减库存
         UpdateStocksRequest updateStocksRequest = orderSdkAdapter.getUpdateProductStock(orderBean, products, StockChangeType.REDUCE,menuType);
         if (updateStocksRequest != null && CollectionUtils.isNotEmpty(updateStocksRequest.getProductStocks())) {
@@ -225,9 +227,12 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
 
         // 下单成锁定劵，冻结失败提示下单失败并冲正库存积分等,判断支付渠道，积分和svc卡直接核销，无需锁定10102 = svc卡支付 || 支付金额小于等于0
         //todo:统一流程 下单锁券再核销
-        CouponLockRequest couponLockRequest = orderSdkAdapter.convert2CouponLockRequest(orderBean, accounts);
-        if (couponLockRequest != null) {
-            BaseResponse<CouponLockResponse> couponLockResponseBaseResponse = offlineCouponSdkService.couponLock(couponLockRequest, "");
+//        CouponLockRequest couponLockRequest = orderSdkAdapter.convert2CouponLockRequest(orderBean, accounts);
+        CouponRequest request = orderSdkAdapter.convert2PreCheckRequest(orderBean, accounts, openId);
+        if (request != null) {
+            request.setChannel_ids(getOrgCodes(orderBean.getCompanyId(),orderBean.getShopId()));
+//            BaseResponse<CouponLockResponse> couponLockResponseBaseResponse = offlineCouponSdkService.couponLock(couponLockRequest, "");
+            BaseResponse<CouponLockResponse> couponLockResponseBaseResponse = offlineCouponSdkService.precheckAndLock(request, LogThreadLocal.getTrackingNo());
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponLockResponseBaseResponse.getCode())) {
                 CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(), AfterSalesType.SYSTEM_CANCEL, "锁定券码失败", "", null);
                 orderCancel(cancelOrderRequest);
@@ -239,6 +244,21 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         return BaseOrderResponse.getErrorBaseOrderResponse(RESPONSE_SUCCESS_STR, "");
     }
 
+    List<String> getOrgCodes(String partnerId, String storeCode) {
+        GetOrgTreeListRequest request = new GetOrgTreeListRequest();
+        request.setPartnerId(partnerId);
+        request.setStoreCode(storeCode);
+        BaseResponse<GetOrgTreeListResponse> orgList = storeCenterService.getOrgTreeList(request, LogThreadLocal.getTrackingNo());
+        if (orgList != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(orgList.getCode())) {
+            List<GetOrgTreeListResponse.OrgList> orgResponseList = orgList.getData().getOrgList();
+            if (CollectionUtils.isEmpty(orgResponseList)){
+                return null;
+            }
+            return orgResponseList.stream().map(org -> org.getOrganizationId()).collect(Collectors.toList());
+        }
+        return null;
+    }
+
     /**
      * 围餐更新库存和积分 
      */

order-application-service/pom.xml

@@ -49,7 +49,7 @@
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.1.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -340,6 +340,7 @@ public class OrderAdapter {
         }
         createOrderDto.setAccounts(CollectionUtils.isNotEmpty(orderAccountDtos) ? orderAccountDtos : Collections.emptyList());
 
+        createOrderDto.setTotalDiscountAmount(shoppingCartGoodsDto.getTotalDiscountAmount());
         // update by miaohui 20201030 for 【ID1018638】【C端服务端】活动库存接口调整对接
         ActivityUpdateStockRequest activityUpdateStockRequest = this.initActivityUpdateStockRequest(activityDiscountsDtos);
 

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

@@ -44,6 +44,13 @@ public class DeliveryController {
         return deliveryService.callbackUrl(request);
     }
 
+    @ApiAnnotation(logMessage = "配送异常回调")
+    @ApiOperation(value = "配送异常回调", notes = "配送异常回调", produces = "application/json")
+    @PostMapping("/delivery/errorCallbackUrl")
+    public BaseResponse errorCallbackUrl(@Valid @LogParams @RequestBody CallbackUrlRequestDto request) {
+        return deliveryService.errorCallbackUrl(request);
+    }
+
     @ApiAnnotation(logMessage = "麦咖啡配送回调")
     @ApiOperation(value = "麦咖啡配送回调", notes = "麦咖啡配送回调", produces = "application/json")
     @PostMapping("/delivery/macCafeCallback")

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

+package cn.freemud.entities.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @ClassName: GetMemberExtendInfoRequestDto
+ * @Description:
+ * @Author: freemud
+ * @Date: 2021/6/9 下午4:28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetMemberExtendInfoRequestDto {
+    private String partnerId;
+
+    private String memberId;
+
+    private Integer isQueryGrade;
+
+    private Integer isQueryPaid;
+
+    private Integer isQueryLabel;
+}

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

+package cn.freemud.entities.dto;
+
+/**
+ * @ClassName: GetMemberExtendInfoResponseDto
+ * @Description:
+ * @Author: freemud
+ * @Date: 2021/6/9 下午4:29
+ */
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+import java.util.List;
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GetMemberExtendInfoResponseDto {
+    private GetMemberExtendInfoResponseDto.MemberGradeDto memberGrade;
+    private List<GetMemberExtendInfoResponseDto.MemberPaidDetail> memberPaids;
+    private List<GetMemberExtendInfoResponseDto.GetMemberLabels> memberLabels;
+
+    @Data
+    public static class MemberGradeDto {
+        private String ruleCode;
+        private String ruleName;
+        private String cycleDate;
+    }
+
+    @Data
+    public static class MemberPaidDetail {
+        private String id;
+        private String paidId;
+        private String paidName;
+        private Date openTime;
+        private Date expiryTime;
+    }
+
+    @Data
+    public static class GetMemberLabels {
+        private String memberId;
+        private String labelCode;
+        private String labelName;
+        private Date updateTime;
+    }
+}

order-application-service/src/main/java/cn/freemud/entities/dto/delivery/CallbackUrlRequestDto.java

@@ -76,5 +76,14 @@ public class CallbackUrlRequestDto {
      * 配送平台统一异常描述
      */
     private String exceptionDesc;
+    /**
+     * 异常状态
+     */
+    private String errorStatus;
+    /**
+     * 异常信息
+     */
+    private String errorDesc;
 
+    private String errorCreateTime;
 }

order-application-service/src/main/java/cn/freemud/entities/dto/ecology/SendMessageRequest.java

@@ -48,4 +48,13 @@ public class SendMessageRequest {
      */
     private String utcTime;
 
+    private String amount;
+
+    private String orderTime;
+
+    private String phone;
+
+    private String UserName;
+
+    private String remindMessage;
 }

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

@@ -15,6 +15,7 @@ public interface ThirdDeliveryService {
      * 配送回调
      */
     BaseResponse callbackUrl(CallbackUrlRequestDto request);
+
     /**
      * 配送回调
      */
@@ -31,4 +32,8 @@ public interface ThirdDeliveryService {
      */
     BaseResponse<DeliveryAmountVo> queryDeliveryAmount(WeixinDeliveryAddressDto request);
 
+    /**
+     * 配送异常回调
+     */
+    BaseResponse errorCallbackUrl(CallbackUrlRequestDto request);
 }

order-application-service/src/main/java/cn/freemud/service/business/OrderBusinessService.java

+package cn.freemud.service.business;
+
+import com.freemud.application.sdk.api.ordercenter.request.PaySuccessReq;
+import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest;
+import com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse;
+
+/**
+ * @ClassName: OrderBusinessService
+ * @Description:
+ * @Author: freemud
+ * @Date: 2021/6/9 下午4:12
+ */
+public interface OrderBusinessService {
+    PayAccessResponse payAccess(ConfirmOrderRequest confirmOrderRequest);
+
+    Integer getPaySuccessTimeout(ConfirmOrderRequest confirmOrderRequest, PaySuccessReq request);
+}

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

@@ -117,7 +117,7 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
         couponCodeVerificationDto.setTrans_id(orderBean.getOid());
         couponCodeVerificationDto.setBusiness_date(DateUtil.convert2Str(new Date(), DateUtil.FORMAT_yyyyMMdd));
         // 核销券新增参数：组织机构ID
-        couponCodeVerificationDto.setChannel_codes(storeService.getOrgIdsArr(orderBean.getCompanyId(), orderBean.getShopId()));
+        couponCodeVerificationDto.setChannel_ids(storeService.getOrgIdsArr(orderBean.getCompanyId(), orderBean.getShopId()));
 
         // 核销交易信息
         List<CouponCodeVerificationTransDto> transactions = new ArrayList<>();

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

@@ -107,7 +107,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
                 couponCodeVerificationDto.setOrderPaymentAmount(orderBean.getAmount());
                 couponCodeVerificationDto.setOrderDiscountAmount(orderBean.getOriginalAmount().longValue()-orderBean.getAmount());
                 // 核销券新增参数：组织机构ID
-                couponCodeVerificationDto.setChannel_codes(storeService.getOrgIdsArr(orderBean.getCompanyId(), orderBean.getShopId()));
+                couponCodeVerificationDto.setChannel_ids(storeService.getOrgIdsArr(orderBean.getCompanyId(), orderBean.getShopId()));
                 try {
                     //71.券核销
                     for (int i = 2; i >= 0; i--) {

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

@@ -329,6 +329,15 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         return ResponseUtil.success(deliveryAmountVo);
     }
 
+    @Override
+    public BaseResponse errorCallbackUrl(CallbackUrlRequestDto request) {
+        // pos获取回调状态
+        sendPosMessage(request.getPartnerId(), request.getStoreId(), request.getOrderId(), 71, request.getErrorDesc());
+        //生态回调
+        sendException(request.getOrderId(),  request.getErrorDesc(),  request.getErrorCreateTime(),  "运单预警");
+        return ResponseUtil.success();
+    }
+
     /**
      * 配送单异常取消配送单
      */
@@ -401,8 +410,11 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
         message.setContent(content);
 
         pushMessageNoticeDto.setData(new Gson().toJson(message));
-
+        try {
             messageNoticeClient.createMessage(pushMessageNoticeDto, LogThreadLocal.getTrackingNo());
+        }catch (Exception e){
+            LogUtil.error("推送消息中心失败，订单编号:{}，失败原因：{}", orderId, "", e);
+        }
     }
 
     /**

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

@@ -34,6 +34,7 @@ import cn.freemud.redis.RedisCache;
 import cn.freemud.service.BuriedPointService;
 import cn.freemud.service.CouponActivityService;
 import cn.freemud.service.MallOrderService;
+import cn.freemud.service.business.OrderBusinessService;
 import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
 import cn.freemud.service.thirdparty.ShoppingCartClient;
 import cn.freemud.utils.LogUtil;
@@ -154,7 +155,8 @@ public class MallOrderServiceImpl implements MallOrderService {
     private AssortmentCustomerInfoManager assortmentCustomerInfoManager;
     @Autowired
     private PaymentQueueService paymentQueueService;
-
+    @Autowired
+    private OrderBusinessService orderBusinessService;
     /**
      * 创建订单
      */
@@ -508,7 +510,7 @@ public class MallOrderServiceImpl implements MallOrderService {
 
         }
         // 订单支付成功
-        com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(confirmOrderRequest);
+        com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderBusinessService.payAccess(confirmOrderRequest);
         String string2 = JSONObject.toJSONString(payAccessRes);
         JSONObject jsonObject2 = JSONObject.parseObject(string2);
         payAccessResponse = jsonObject2.toJavaObject(PayAccessResponse.class);

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

@@ -21,6 +21,7 @@ import cn.freemud.interceptor.ServiceException;
 import cn.freemud.manager.BuyProductOnceManager;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.CouponService;
+import cn.freemud.service.business.OrderBusinessService;
 import cn.freemud.service.thirdparty.StoreItemClient;
 import cn.freemud.utils.LogUtil;
 import cn.freemud.utils.ResponseUtil;
@@ -144,6 +145,8 @@ public class SellCouponOrderServiceImpl {
     private final String SUCCESS = "100";
 
     private final String ngsCouponProductId = "76161384";
+    @Autowired
+    private OrderBusinessService orderBusinessService;
 
     @Autowired
     private BuyProductOnceManager buyProductOnceManager;
@@ -787,7 +790,7 @@ public class SellCouponOrderServiceImpl {
         }
         try {
             // 订单支付成功
-            PayAccessResponse payAccessResponse = orderCenterSdkService.payAccess(var1);
+            PayAccessResponse payAccessResponse = orderBusinessService.payAccess(var1);
         }catch (Exception e){
             LogUtil.error(LogThreadLocal.getTrackingNo(),"sdkPayAccessError",JSONObject.toJSONString(var1),null,e);
         }

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

@@ -10,6 +10,7 @@ import cn.freemud.utils.*;
 import com.freemud.application.sdk.api.base.BaseResponse;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest;
+import com.freemud.application.sdk.api.storecenter.response.vo.GetOrgTreeListResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
@@ -24,6 +25,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @Service
 public class StoreServiceImpl implements StoreService {
@@ -201,9 +203,14 @@ public class StoreServiceImpl implements StoreService {
         request.setPartnerId(partnerId);
         request.setStoreCode(storeCode);
         StoreCenterService storeCenterService = SpringBeanUtil.getBean(StoreCenterService.class);
-        BaseResponse<List<String>> orgList = storeCenterService.getOrgList(request, LogThreadLocal.getTrackingNo());
+//        BaseResponse<List<String>> orgList = storeCenterService.getOrgList(request, LogThreadLocal.getTrackingNo());
+        BaseResponse<GetOrgTreeListResponse> orgList = storeCenterService.getOrgTreeList(request, LogThreadLocal.getTrackingNo());
         if (orgList != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(orgList.getCode())) {
-            return orgList.getData();
+            List<GetOrgTreeListResponse.OrgList> orgResponseList = orgList.getData().getOrgList();
+            if (CollectionUtils.isEmpty(orgResponseList)){
+                return null;
+            }
+            return orgResponseList.stream().map(org -> org.getOrganizationId()).collect(Collectors.toList());
         }
         return null;
     }

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

-///**
-// * All rights Reserved, Designed By www.freemud.cn
-// *
-// * @Title: CustomerExtendClient
-// * @Package cn.freemud.service.thirdparty
-// * @Description:
-// * @author: song.cai
-// * @date: 2019/2/20 16:42
-// * @version V1.0
-// * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
-// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
-// */
-//
-//package cn.freemud.service.thirdparty;
-//
-//import cn.freemud.entities.dto.*;
-//import com.alibaba.fastjson.JSONObject;
-//import org.springframework.cloud.openfeign.FeignClient;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestBody;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//
-//@FeignClient(name = "CUSTOMER-SERVICE", url = "${saas.customerclient.feign.url}")
-//@RequestMapping(produces = {"application/json;charset=UTF-8"})
-//public interface CustomerClient {
-//    /**
-//     * 根据聚道注册会员
-//     */
-//    @PostMapping(value = "/customerservice/registerByChannel")
-//    MemberRegisterResponseDto registerByChannel(@RequestBody MemberRegisterRequestDto memberRegisterRequestDto);
-//
-//    /**
-//     * 根据渠道信息查询顾客信息
-//     */
-//    @PostMapping(value = "/customerservice/getMemberByChannel")
-//    GetMemberInfoByChannelResponseDto getMemberInfoByChannel(@RequestBody GetMemberInfoByChannelRequestDto getMemberInfoByChannelRequestDto);
-//
-//    /**
-//     * 修改unionid
-//     */
-//    @PostMapping(value = "/customerservice/updateMemberChannel")
-//    JSONObject updateUserUnionId(@RequestBody UpdateMemUnionIdRequestDto updateMemUnionIdRequestDto);
-//
-//    /**
-//     * 根据会员id获取会员信息
-//     */
-//    @PostMapping(value = "/customerservice/getMemberById")
-//    GetMemberInfoByIdResponseDto getMemberInfoById(@RequestBody GetMemberInfoByIdRequestDto getMemberInfoByIdRequestDto);
-//
-//    /**
-//     * 修改顾客信息
-//     */
-//    @PostMapping(value = "/customerservice/update")
-//    JSONObject editMemberInfo(@RequestBody EditMemberInfoRequestDto editMemberInfoRequestDto);
-//
-//
-//    /**
-//     * 获取用户收货地址列表
-//     */
-//    @PostMapping(value = "/customerservice/address/getAddressList")
-//    GetReceiveAddressListResponseDto getReceiveAddressList(@RequestBody GetReceiveAddressListDto getReceiveListDto);
-//
-//    /**
-//     * 新增收货地址
-//     */
-//    @PostMapping(value = "/customerservice/address/add")
-//    AddReceiveAddressResponseDto addReceiveAddress(@RequestBody AddReceiveAddressDto addReceiveDto);
-//
-//    /**
-//     * 修改收货地址
-//     */
-//    @PostMapping(value = "/customerservice/address/update")
-//    UpdateReceiveAddressResponseDto updateReceiveAddress(@RequestBody UpdateReceiveAddressDto updateReceiveAddressDto);
-//
-//    /**
-//     * 删除收货地址
-//     */
-//    @PostMapping(value = "/customerservice/address/delete")
-//    DeleteReceiveAddressResponseDto deleteReceiveAddress(@RequestBody DeleteReceiveAddressDto deleteReceiveAddressDto);
-//
-//
-//    /**
-//     * 查询收货地址详情
-//     */
-//    @PostMapping(value = "/customerservice/address/get")
-//    QueryReceiveAddressResponseDto queryReceiveAddressById(@RequestBody QueryReceiveAddressDto queryReceiveAddressDto);
-//}
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: CustomerExtendClient
+ * @Package cn.freemud.service.thirdparty
+ * @Description:
+ * @author: song.cai
+ * @date: 2019/2/20 16:42
+ * @version V1.0
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+
+package cn.freemud.service.thirdparty;
+
+import cn.freemud.entities.dto.*;
+import com.freemud.application.sdk.api.base.BaseResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@FeignClient(name = "CUSTOMER-SERVICE", url = "${saas.customerclient.feign.url}")
+@RequestMapping(produces = { "application/json;charset=UTF-8" })
+public interface CustomerClient {
+    // /**
+    // * 根据聚道注册会员
+    // */
+    // @PostMapping(value = "/customerservice/registerByChannel")
+    // MemberRegisterResponseDto registerByChannel(@RequestBody MemberRegisterRequestDto memberRegisterRequestDto);
+    //
+    // /**
+    // * 根据渠道信息查询顾客信息
+    // */
+    // @PostMapping(value = "/customerservice/getMemberByChannel")
+    // GetMemberInfoByChannelResponseDto getMemberInfoByChannel(@RequestBody GetMemberInfoByChannelRequestDto
+    // getMemberInfoByChannelRequestDto);
+    //
+    // /**
+    // * 修改unionid
+    // */
+    // @PostMapping(value = "/customerservice/updateMemberChannel")
+    // JSONObject updateUserUnionId(@RequestBody UpdateMemUnionIdRequestDto updateMemUnionIdRequestDto);
+    //
+    // /**
+    // * 根据会员id获取会员信息
+    // */
+    // @PostMapping(value = "/customerservice/getMemberById")
+    // GetMemberInfoByIdResponseDto getMemberInfoById(@RequestBody GetMemberInfoByIdRequestDto
+    // getMemberInfoByIdRequestDto);
+    //
+    // /**
+    // * 修改顾客信息
+    // */
+    // @PostMapping(value = "/customerservice/update")
+    // JSONObject editMemberInfo(@RequestBody EditMemberInfoRequestDto editMemberInfoRequestDto);
+    //
+    //
+    // /**
+    // * 获取用户收货地址列表
+    // */
+    // @PostMapping(value = "/customerservice/address/getAddressList")
+    // GetReceiveAddressListResponseDto getReceiveAddressList(@RequestBody GetReceiveAddressListDto getReceiveListDto);
+    //
+    // /**
+    // * 新增收货地址
+    // */
+    // @PostMapping(value = "/customerservice/address/add")
+    // AddReceiveAddressResponseDto addReceiveAddress(@RequestBody AddReceiveAddressDto addReceiveDto);
+    //
+    // /**
+    // * 修改收货地址
+    // */
+    // @PostMapping(value = "/customerservice/address/update")
+    // UpdateReceiveAddressResponseDto updateReceiveAddress(@RequestBody UpdateReceiveAddressDto
+    // updateReceiveAddressDto);
+    //
+    // /**
+    // * 删除收货地址
+    // */
+    // @PostMapping(value = "/customerservice/address/delete")
+    // DeleteReceiveAddressResponseDto deleteReceiveAddress(@RequestBody DeleteReceiveAddressDto
+    // deleteReceiveAddressDto);
+    //
+    //
+    // /**
+    // * 查询收货地址详情
+    // */
+    // @PostMapping(value = "/customerservice/address/get")
+    // QueryReceiveAddressResponseDto queryReceiveAddressById(@RequestBody QueryReceiveAddressDto
+    // queryReceiveAddressDto);
+
+    /**
+     * 查询收货地址详情
+     */
+    @PostMapping(value = "/customerservice/extend/getMemberExtendInfo")
+    BaseResponse<GetMemberExtendInfoResponseDto>
+            getMemberExtendInfo(@RequestBody GetMemberExtendInfoRequestDto extendInfoRequest);
+}

order-management/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>couponcenter-sdk</artifactId>
-            <version>1.9.2.RELEASE</version>
+            <version>4.1.2-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
 

shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/coupon/KgdCouponServiceImpl.java

@@ -82,7 +82,7 @@ public class KgdCouponServiceImpl implements CouponService {
 
         List<String> orgIds = storeService.getOrgIds(getStoreBO);
         String channelIds = CollectionUtils.isNotEmpty(orgIds) ? Joiner.on(",").join(orgIds) : "";
-        map.put(Finals.CHANNEL_CODE_LIST, channelIds);
+        map.put(Finals.CHANNEL_ID_LIST, channelIds);
         String appSecret = getAppSecret(getCouponDetailBO.getPartnerId());
         String sign = SignUtil.createMD5Sign(map, appSecret);
         map.put(Finals.SIGN, sign);

shopping-cart-application-service/src/main/java/cn/freemud/demo/manager/store/KgdStoreServiceImpl.java

@@ -15,11 +15,16 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
 import com.freemud.application.sdk.api.storecenter.request.vo.GetOrgTreeListRequest;
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
+import com.freemud.application.sdk.api.storecenter.response.vo.GetOrgTreeListResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
+import com.freemud.application.sdk.api.util.ResponseUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 @Service("KgdStoreService")
 public class KgdStoreServiceImpl implements StoreService {
@@ -39,12 +44,19 @@ public class KgdStoreServiceImpl implements StoreService {
         GetOrgTreeListRequest request = new GetOrgTreeListRequest();
         request.setPartnerId(getStoreBO.getPartnerId());
         request.setStoreCode(getStoreBO.getStoreCode());
-        BaseResponse<List<String>> orgList = storeCenterService.getOrgList(request, LogThreadLocal.getTrackingNo());
-        if (orgList != null && ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(orgList.getCode())) {
-            return orgList.getData();
+        BaseResponse<GetOrgTreeListResponse> response = storeCenterService.getOrgTreeList(request, LogThreadLocal.getTrackingNo());
+        if (Objects.equals("100", response.getCode()) && response.getData() != null) {
+            List<GetOrgTreeListResponse.OrgList> orgList = ((GetOrgTreeListResponse)response.getData()).getOrgList();
+            if (CollectionUtils.isEmpty(orgList)) {
+                return null;
+            } else {
+                List<String> orgIds = (List)orgList.stream().map(GetOrgTreeListResponse.OrgList::getOrganizationId).collect(Collectors.toList());
+                return orgIds;
             }
+        } else {
             return null;
         }
+    }
 
     @Override
     public StoreInfoBO getStoreInfo(GetStoreInfoBO getStoreInfo) {

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

@@ -9,10 +9,15 @@ import cn.freemud.demo.entities.bo.store.StoreInfoBO;
 import cn.freemud.demo.manager.customer.CustomerManager;
 import cn.freemud.demo.manager.store.StoreManager;
 import cn.freemud.entities.dto.StoreDeliveryInfoDto;
+import cn.freemud.entities.vo.QueryDeliveryDistanceRequest;
+import cn.freemud.entities.vo.QueryDeliveryDistanceResponseVo;
 import cn.freemud.entities.vo.ShoppingCartGoodsResponseVo;
 import cn.freemud.enums.CreateOrderType;
+import cn.freemud.enums.ResponseResult;
 import cn.freemud.enums.ScopeConfigType;
+import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.delivery.DeliveryFactory;
+import cn.freemud.service.thirdparty.DeliveryFeiginClient;
 import cn.freemud.utils.WebUtil;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
@@ -42,6 +47,8 @@ public class DeliveryServiceImpl {
     @Autowired
     private DeliveryFactory deliveryFactory;
 
+    @Autowired
+    private DeliveryFeiginClient deliveryFeiginClient;
     // 配送费逻辑是否使用旧的
     @Value("${store.delivery.use.old:true}")
     private boolean storeDeliveryUseOld;
@@ -238,10 +245,15 @@ public class DeliveryServiceImpl {
      * @return
      */
     public double getDistance(String shopLng, String shopLat, String addressLng, String addressLat) {
-        if (StringUtils.isBlank(shopLng) || StringUtils.isBlank(shopLat) || StringUtils.isBlank(addressLng) || StringUtils.isBlank(addressLat)) {
-            return 100000;
+//        if (StringUtils.isBlank(shopLng) || StringUtils.isBlank(shopLat) || StringUtils.isBlank(addressLng) || StringUtils.isBlank(addressLat)) {
+//            return 100000;
+//        }
+//        return WebUtil.calDistance(Double.valueOf(shopLng), Double.valueOf(shopLat), Double.valueOf(addressLng), Double.valueOf(addressLat));
+        QueryDeliveryDistanceResponseVo responseVo = deliveryFeiginClient.queryDeliveryDistance(new QueryDeliveryDistanceRequest(Double.parseDouble(shopLat), Double.parseDouble(shopLng), Double.parseDouble(addressLat), Double.parseDouble(addressLng)));
+        if (responseVo == null || responseVo.getCode() != 100 || responseVo.getData().getDistance() == null) {
+            throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
         }
-        return WebUtil.calDistance(Double.valueOf(shopLng), Double.valueOf(shopLat), Double.valueOf(addressLng), Double.valueOf(addressLat));
+        return responseVo.getData().getDistance();
     }
 
 }

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/QueryDeliveryDistanceRequest.java

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+/**
+ * @ClassName: QueryDeliveryDistanceRequest
+ * @Description:
+ * @Author: freemud
+ * @Date: 2021/6/3 下午8:44
+ */
+@Data
+public class QueryDeliveryDistanceRequest {
+    /**
+     * 目的地纬度
+     */
+    private double desLatitude;
+
+    /**
+     * 目的地经度
+     */
+    private double desLongitude;
+
+    /**
+     * 出发点纬度
+     */
+    private double oriLatitude;
+
+    /**
+     * 出发点经度
+     */
+    private double oriLongitude;
+
+    public QueryDeliveryDistanceRequest(double desLatitude, double desLongitude, double oriLatitude, double oriLongitude) {
+        this.desLatitude = desLatitude;
+        this.desLongitude = desLongitude;
+        this.oriLatitude = oriLatitude;
+        this.oriLongitude = oriLongitude;
+    }
+}

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/QueryDeliveryDistanceResponseVo.java

+package cn.freemud.entities.vo;
+
+import lombok.Data;
+
+/**
+ * @ClassName: QueryDeliveryDistanceResponseVo
+ * @Description:
+ * @Author: freemud
+ * @Date: 2021/6/3 下午8:36
+ */
+@Data
+public class QueryDeliveryDistanceResponseVo {
+    private Integer code;
+
+    private RoutePlanner data;
+
+    private String msg;
+
+    @Data
+    public static class RoutePlanner {
+
+        /**
+         * 起终点的骑行距离，单位：米
+         */
+        private Integer distance;
+
+        /**
+         * 起终点的骑行时间，单位：秒
+         */
+        private Integer duration;
+    }
+}

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

@@ -97,7 +97,7 @@ public interface CommonService {
     }
 
     default String getOrgIdsAsString(String partnerId, String storeCode) {
-        List<String> orgIdList = this.getOrgIds(partnerId, storeCode);
+        List<String> orgIdList = this.getOrgIdsForCoupon(partnerId, storeCode);
         return CollectionUtils.isNotEmpty(orgIdList) ? Joiner.on(",").join(orgIdList) : "";
     }
 

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

@@ -287,7 +287,7 @@ public class CouponServiceImpl implements CouponService {
         map.put(Finals.ACTION, "code.allDetails");
         // 券码接口新增参数：组织机构（多个用英文逗号分离）
         String channelIds = commonService.getOrgIdsAsString(requestVo.getPartnerId(), requestVo.getStoreId());
-        map.put(Finals.CHANNEL_CODE_LIST, channelIds);
+        map.put(Finals.CHANNEL_ID_LIST, channelIds);
         String appSecret = getAppSecret(requestVo.getPartnerId());
         String sign = SignUtil.createMD5Sign(map, appSecret);
         map.put(Finals.SIGN, sign);
@@ -511,8 +511,8 @@ public class CouponServiceImpl implements CouponService {
         Long totalAmount = createProductRequest(cartGoods, productList, isNew);
         couponAvailableReqVo.setTotalAmount(Integer.valueOf(totalAmount + ""));
         couponAvailableReqVo.setProductList(productList);
-        couponAvailableReqVo.setChannelCodeList(commonService.getOrgCodes(partnerId, storeId));
-//        couponAvailableReqVo.setChannelIdList(commonService.getOrgIdsForCoupon(partnerId, storeId));
+//        couponAvailableReqVo.setChannelCodeList(commonService.getOrgCodes(partnerId, storeId));
+        couponAvailableReqVo.setChannelIdList(commonService.getOrgIdsForCoupon(partnerId, storeId));
         if (StringUtils.isNotBlank(menuType)) {
             String code = BusinessTypeEnum.getByType(menuType).getCode();
             String channel = CouponRedeemChannel.getChannelByType(code);

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

@@ -795,7 +795,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         List<String> cartGoodsUidList = calculationDiscountGoodsList.stream().map(ActivityCalculationDiscountRequestDto.CalculationDiscountGoods::getCartGoodsUid).collect(toList());
         activityCalculationDiscountRequestDto.setGoods(calculationDiscountGoodsList);
         activityCalculationDiscountRequestDto.setCoupons(coupons);
-        activityCalculationDiscountRequestDto.setOrgIds(commonService.getOrgIds(partnerId, storeId));
+        activityCalculationDiscountRequestDto.setOrgIds(commonService.getOrgIdsForCoupon(partnerId, storeId));
         activityCalculationDiscountRequestDto.setDistributionFee(distributionFee);
         activityCalculationDiscountRequestDto.setIsMember(isMember);
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto;

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

@@ -569,7 +569,7 @@ public class ShoppingCartMealServiceImpl implements ShoppingCartNewService {
 
         activityCalculationDiscountRequestDto.setGoods(calculationDiscountGoodsList);
         activityCalculationDiscountRequestDto.setCoupons(coupons);
-        activityCalculationDiscountRequestDto.setOrgIds(commonService.getOrgIds(partnerId, storeId));
+        activityCalculationDiscountRequestDto.setOrgIds(commonService.getOrgIdsForCoupon(partnerId, storeId));
         activityCalculationDiscountRequestDto.setDistributionFee(distributionFee);
         activityCalculationDiscountRequestDto.setIsMember(isMember);
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto;

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

@@ -1405,7 +1405,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         }
         activityCalculationDiscountRequestDto.setGoods(calculationDiscountGoodsList);
         activityCalculationDiscountRequestDto.setCoupons(coupons);
-        activityCalculationDiscountRequestDto.setOrgIds(commonService.getOrgIds(partnerId, storeId));
+        activityCalculationDiscountRequestDto.setOrgIds(commonService.getOrgIdsForCoupon(partnerId, storeId));
         activityCalculationDiscountRequestDto.setDistributionFee(distributionFee);
         activityCalculationDiscountRequestDto.setIsMember(isMember);
         ActivityCalculationDiscountResponseDto activityCalculationDiscountResponseDto;
@@ -2949,7 +2949,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         Integer orderType = requestVo.getOrderType();
 
         CouponAvailableCartInfo couponAvailableCartInfo;
-        List<String>  orgCodes =  commonService.getOrgCodes(partnerId, storeId);
+        List<String>  orgCodes =  commonService.getOrgIdsForCoupon(partnerId, storeId);
         // 获取购物车商品
         List<CartGoods> cartGoodsList = assortmentSdkService.getShoppingCartForCoupon(partnerId, requestVo.getStoreId(), userId, "", shoppingCartBaseService);
         if (grayPush(partnerId,storeId,"2")) {

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

@@ -11,6 +11,7 @@ import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.manager.*;
 //import cn.freemud.service.thirdparty.StoreClient;
+import cn.freemud.service.thirdparty.DeliveryFeiginClient;
 import cn.freemud.utils.*;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
@@ -49,7 +50,8 @@ public class StoreServiceImpl {
     private OpenPlatformIappWxappConfigDeliveryManager openPlatformIappWxappConfigDeliveryManager;
     @Autowired
     private OpenPlatformIappWxappConfigManager openPlatformIappWxappConfigManager;
-
+    @Autowired
+    private DeliveryFeiginClient deliveryFeiginClient;
     /**
      * 确定门店是否打烊
      */
@@ -417,10 +419,12 @@ public class StoreServiceImpl {
      * @return
      */
     public double getDistance(String shopLng, String shopLat, String addressLng, String addressLat) {
-        if (StringUtils.isBlank(shopLng) || StringUtils.isBlank(shopLat) || StringUtils.isBlank(addressLng) || StringUtils.isBlank(addressLat)) {
-            return 100000;
+//        return WebUtil.calDistance(Double.valueOf(shopLng), Double.valueOf(shopLat), Double.valueOf(addressLng), Double.valueOf(addressLat));
+        QueryDeliveryDistanceResponseVo responseVo = deliveryFeiginClient.queryDeliveryDistance(new QueryDeliveryDistanceRequest(Double.parseDouble(shopLat), Double.parseDouble(shopLng), Double.parseDouble(addressLat), Double.parseDouble(addressLng)));
+        if (responseVo == null || responseVo.getCode() != 100 || responseVo.getData().getDistance() == null) {
+            throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
         }
-        return WebUtil.calDistance(Double.valueOf(shopLng), Double.valueOf(shopLat), Double.valueOf(addressLng), Double.valueOf(addressLat));
+        return responseVo.getData().getDistance();
     }
 
 }

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

@@ -191,7 +191,7 @@ public class CalculationSharingDiscountService {
         //组装促销
         calculationSharingDiscountRequestDto.setGoods(calculationDiscountGoodsList);
         calculationSharingDiscountRequestDto.setCoupons(coupons);
-        calculationSharingDiscountRequestDto.setOrgIds(commonService.getOrgIds(partnerId,storeId));
+        calculationSharingDiscountRequestDto.setOrgIds(commonService.getOrgIdsForCoupon(partnerId,storeId));
         calculationSharingDiscountRequestDto.setDistributionFee(deliveryAmount);
         calculationSharingDiscountRequestDto.setIsMember(isMember);
 

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

 package cn.freemud.service.thirdparty;
 
 import cn.freemud.base.entity.BaseResponse;
+import cn.freemud.entities.vo.QueryDeliveryDistanceRequest;
+import cn.freemud.entities.vo.QueryDeliveryDistanceResponseVo;
 import cn.freemud.entities.vo.QueryDeliveryTemplateRequestVo;
 import cn.freemud.entities.vo.QueryDeliveryTemplateResponseVo;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -13,4 +15,6 @@ public interface DeliveryFeiginClient {
     @PostMapping("/delivery/queryDeliveryTemplate")
     QueryDeliveryTemplateResponseVo queryDeliveryTemplate(@RequestBody QueryDeliveryTemplateRequestVo queryDeliveryTemplateRequestVo);
 
+    @PostMapping("/tools/routePlanner")
+    QueryDeliveryDistanceResponseVo queryDeliveryDistance(@RequestBody QueryDeliveryDistanceRequest queryDeliveryTemplateRequestVo);
 }