Merge branch 'develop' of gitlab.freemud.com:order-group-application/order-group into develop

assortment-ordercenter-sdk/pom.xml

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

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

@@ -221,7 +221,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         CouponRequest couponVerificationRequest = orderSdkAdapter.convert2CouponVerificationRequest(orderBean, accounts);
         if (couponVerificationRequest!=null){
             // 核销券新增参数：组织机构
-            couponVerificationRequest.setChannel_ids(this.getOrgIds(orderBean.getCompanyId(), orderBean.getShopId()));
+            couponVerificationRequest.setChannel_codes(this.getOrgIds(orderBean.getCompanyId(), orderBean.getShopId()));
             BaseResponse<CouponRedeemResponse> couponRedeemResponseBaseResponse = offlineCouponSdkService.couponRedeem(couponVerificationRequest, "");
             if (!ObjectUtils.equals(RESPONSE_SUCCESS_STR, couponRedeemResponseBaseResponse.getCode())) {
                 //TODO 失败取消订单,异步冲正库存

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())) {

order-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <artifactId>couponcenter-sdk</artifactId>
             <groupId>com.freemud.application.service.sdk</groupId>
-            <version>1.8.14.RELEASE</version>
+            <version>1.10.4-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

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

@@ -27,5 +27,6 @@ public class CouponCodeBaseDto  {
 
     // 组织机构ID,(String 类型的集合)
     private String[] channel_ids;
+    private String[] channel_codes;
 
 }

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

@@ -98,7 +98,7 @@ public class CouponActivityServiceImpl implements CouponActivityService {
                     || OrderAccountType.DISCOUNT_COUPON.getCode().equals(accountBean.getType())) {
                 CouponCodeVerificationDto couponCodeVerificationDto = couponAdapter.convert2CouponCodeVerificationDto(activityChannelEnum, accountBean.getAccountId(), orderBean.getOid(), orderBean.getCompanyId(), orderBean.getShopId(), orderBean.getUserId(), products, accountBean.getPrice().intValue());
                 // 核销券新增参数：组织机构ID
-                couponCodeVerificationDto.setChannel_ids(storeService.getOrgIdsArr(orderBean.getCompanyId(), orderBean.getShopId()));
+                couponCodeVerificationDto.setChannel_codes(storeService.getOrgIdsArr(orderBean.getCompanyId(), orderBean.getShopId()));
                 try {
                     //71.券核销
                     CouponCodeResponseDto couponCodeResponseDto = couponOfflineClient.verification(couponCodeVerificationDto);

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/user/GetUserScoreUserDetailResponse.java

@@ -32,8 +32,7 @@ public class GetUserScoreUserDetailResponse {
         private Integer reducePriceLimit;
         private Integer getReduceScoreLimit;
         /**
-         * 积分抵扣状态
-         * 1积分可用  2积分不足  3 积分抵扣开关禁用
+         * 积分抵扣状态 1积分可用  2积分不足  3 积分抵扣开关禁用 4、订单金额不满足开启积分抵现要求
          */
         private Integer scoreState;
         /**
@@ -41,6 +40,11 @@ public class GetUserScoreUserDetailResponse {
          * 例如10积分抵扣5元为  10:5
          */
         private String scoreReduceRate;
+
+        /**
+         * 是否可优惠同享{0所有订单均可抵扣,1仅限原价订单才可抵扣（享受了促销活动、或使用了优惠券，不能进行积分抵扣）
+         */
+        private Integer overlayOffers;
     }
 
 }
\ No newline at end of file

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

@@ -22,4 +22,8 @@ public class ShoppingCartCustomerScoreVo {
     private Integer reduceAmount;
     private Integer useScore;
     private String customerScorePrompt;
+    /**
+     * 是否可优惠同享{0所有订单均可抵扣,1仅限原价订单才可抵扣（享受了促销活动、或使用了优惠券，不能进行积分抵扣)
+     */
+    private String overlayOffers;
 }

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);

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

@@ -14,7 +14,7 @@ import cn.freemud.service.thirdparty.CustomScoreClient;
 import cn.freemud.utils.LogUtil;
 import com.freemud.application.sdk.api.constant.FMStatusCode;
 import com.freemud.application.sdk.api.log.ErrorLog;
-import org.apache.commons.lang.ObjectUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -65,9 +65,21 @@ public class CustomerScoreService implements IPromotionService {
             customerScoreVo.setCurrentScore(getValue(userScoreUseDetail.getResult().getCurrentScore()));
             customerScoreVo.setReduceAmount(getValue(userScoreUseDetail.getResult().getReduceAmount()));
             customerScoreVo.setReducePriceLimit(getValue(userScoreUseDetail.getResult().getReducePriceLimit()));
-            customerScoreVo.setScoreReduceState(userScoreUseDetail.getResult().getScoreState());
+            // 是否可优惠同享{0所有订单均可抵扣,1仅限原价订单才可抵扣（享受了促销活动、或使用了优惠券，不能进行积分抵扣
+            if (userScoreUseDetail.getResult().getOverlayOffers() == 0) {
+                customerScoreVo.setScoreReduceState(userScoreUseDetail.getResult().getScoreState());
+            } else {
+                if (StringUtils.isNotBlank(shoppingCartInfoRequestVo.getCouponCode()) || calculationDiscountResult.getTotalDiscountAmount().intValue() > 0) {
+                    //积分抵扣开关禁用
+                    customerScoreVo.setScoreReduceState(3);
+                    discountAmount = 0;
+                }
+            }
+
             customerScoreVo.setUseScore(getValue(userScoreUseDetail.getResult().getUseScore()));
             String msg = "";
+
+            // 积分抵扣状态 1积分可用  2积分不足  3 积分抵扣开关禁用 4、订单金额不满足开启积分抵现要求
             switch (userScoreUseDetail.getResult().getScoreState()) {
                 case 1:
                     msg = String.format("共%s积分，可用%s积分抵¥%s", getValue(userScoreUseDetail.getResult().getCurrentScore()), getValue(userScoreUseDetail.getResult().getUseScore()), ((double) userScoreUseDetail.getResult().getReduceAmount()) / 100);
@@ -76,6 +88,9 @@ public class CustomerScoreService implements IPromotionService {
                     String[] split = userScoreUseDetail.getResult().getScoreReduceRate().split(":");
                     msg = String.format("共%s积分，每%s积分可抵¥%s", getValue(userScoreUseDetail.getResult().getCurrentScore()), split[0], split[1]);
                     break;
+                case 3:
+                    msg = "已享受优惠，无法再参与积分抵扣";
+                    break;
                 case 4:
                     msg = String.format("共%s积分，订单满¥%s可开启积分抵现", getValue(userScoreUseDetail.getResult().getCurrentScore()), ((double) userScoreUseDetail.getResult().getReducePriceLimit()) / 100);
                     break;