Merge branch 'feature/20200513_1.9.25_订单对接券码字段修改' into develop

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -410,7 +410,7 @@ public interface ShoppingCartBaseService {
         couponDetailRequest.setMerchantId(partnerId);
         couponDetailRequest.setPartnerId(partnerId);
         // 券码新增参数：组织机构
-        couponDetailRequest.setChannelCodeList(this.getOrgCodes(partnerId, storeId));
+        couponDetailRequest.setChannelCodeList(this.getOrgIds(partnerId, storeId));
         OnlineCouponSdkService onlineCouponSdkService = SDKCommonBaseContextWare.getBean(OnlineCouponSdkService.class);
         com.freemud.application.sdk.api.base.BaseResponse<CouponDetailResponse> couponDetailResponse = onlineCouponSdkService.allDetail(couponDetailRequest, appKey, trackingNo);
         if (couponDetailResponse == null || !CartResponseConstant.SUCCESS.getCode().equals(couponDetailResponse.getCode()) || couponDetailResponse.getData() == null || CollectionUtils.isEmpty(couponDetailResponse.getData().getDetails())) {

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

@@ -237,7 +237,7 @@ public class CouponServiceImpl implements CouponService {
         map.put(Finals.ACTION, "code.allDetails");
         // 券码接口新增参数：组织机构（多个用英文逗号分离）
         String channelIds = commonService.getOrgIdsAsString(requestVo.getPartnerId(), requestVo.getStoreId());
-        map.put(Finals.CHANNEL_ID_LIST, channelIds);
+        map.put(Finals.CHANNEL_CODE_LIST, channelIds);
         String appSecret = getAppSecret(requestVo.getPartnerId());
         String sign = SignUtil.createMD5Sign(map, appSecret);
         map.put(Finals.SIGN, sign);