Merge remote-tracking branch 'remotes/origin/feature/1.9.26_积分抵扣规则，新增是否与促销和优惠券同享' into develop

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