修复 bugdone 周焕王斐提交的bug

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java

@@ -186,7 +186,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         int canUse = 0;
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             CandyCouponVo baseVo = CouponBaseUtil.getPerformanceCouponUserVo(dtoItem, priceTotal, performanceId, timeId, ticketId);
-            if (baseVo.getCouType().equals(101)) {
+            if (baseVo.getCouType().equals(101) || baseVo.getBusiType() == 2) {
                 continue;
             }
             if (baseVo.getState().equals(1)) { //可用
@@ -255,7 +255,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
         int canUse = 0;
         for (CandyUserCouponBasicDto dtoItem : dtoList) {
             CandyCouponVo baseVo = CouponBaseUtil.getGoodCouponUserVo(dtoItem, priceTotal, goodId, dtoList.size());
-            if (baseVo.getCouType().equals(101)) {
+            if (baseVo.getCouType().equals(101) || baseVo.getBusiType() == 1 || baseVo.getBusiType() == 3) {
                 continue;
             }
             if (baseVo.getState().equals(1)) { //可用

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/util/CouponBaseUtil.java

@@ -109,7 +109,15 @@ public class CouponBaseUtil {
                         isTarget = isTargetCoupon(ruleItem.getBusiId(), dtoItem.getCouType(), ticketId, priceTotal, dtoItem.getValOver());
                         break;
                     case 100://全场
-                        isTarget = true;
+                        if (dtoItem.getCouType().equals(2)) {
+                            if (priceTotal.compareTo(dtoItem.getValOver()) >= 0) {
+                                isTarget = true;
+                            }else{
+                                isTarget = false;
+                            }
+                        } else {
+                            isTarget = true;
+                        }
                         break;
                     default:
                         isTarget = false;
@@ -120,7 +128,7 @@ public class CouponBaseUtil {
                 }
             }
 
-            if (dtoItem.getUseRules().size() == 0 && !dtoItem.getBusiType().equals(0)) {
+            if (dtoItem.getUseRules().size() == 0 && dtoItem.getBusiType().equals(2)) {
                 isTarget = false;
             }
         }
@@ -185,18 +193,23 @@ public class CouponBaseUtil {
 //                        isTarget = isTargetCoupon(ruleItem.getBusiId(), dtoItem.getCouType(), produceId, priceTotal, dtoItem.getValOver());
                         break;
                     case 100://全场
-                        isTarget = true;
+                        if (dtoItem.getCouType().equals(2)) {
+                            if (priceTotal.compareTo(dtoItem.getValOver()) >= 0) {
+                                isTarget = true;
+                            }else{
+                                isTarget = false;
+                            }
+                        } else {
+                            isTarget = true;
+                        }
                         break;
                     default:
                         isTarget = false;
                         break;
                 }
-                if (size > 1 && dtoItem.getCouType().equals(4)) {
-                    isTarget = false;
-                }
             }
 
-            if (dtoItem.getUseRules().size() == 0 && !dtoItem.getBusiType().equals(0)) {
+            if (dtoItem.getUseRules().size() == 0 && (dtoItem.getBusiType().equals(1) || dtoItem.getBusiType().equals(3))) {
                 isTarget = false;
             }
         }