优化冲突提示

src/main/java/com/gogirl/application/market/coupon/impl/MarketServiceImpl.java

@@ -539,7 +539,7 @@ public class MarketServiceImpl implements MarketService {
 //                            couponOrderRelevanceService.save(couponOrderRelevance);
 
                         } else {
-                            throw new RRException("外部券冲突");
+                            throw new RRException("%冲突与其他优惠冲突", couponCustomerRelevance.getCouponName());
                         }
 
                     });
@@ -638,7 +638,7 @@ public class MarketServiceImpl implements MarketService {
                 }
                 //内部券抵扣不了
                 else {
-                    throw new RRException("内部券冲突");
+                    throw new RRException("{}与其他卡券冲突", couponCustomerRelevance.getCouponName());
                 }
             };
 
@@ -878,7 +878,7 @@ public class MarketServiceImpl implements MarketService {
                             couponOrderRelevanceService.save(couponOrderRelevance);
 
                         } else {
-                            throw new RRException("外部券冲突");
+                            throw new RRException("%冲突与其他优惠冲突", couponCustomerRelevance.getCouponName());
                         }
 
                     });
@@ -971,7 +971,7 @@ public class MarketServiceImpl implements MarketService {
                 }
                 //内部券抵扣不了
                 else {
-                    throw new RRException("内部券冲突");
+                    throw new RRException("%与其他优惠冲突", couponCustomerRelevance.getCouponName());
                 }
             };
 
@@ -1213,7 +1213,7 @@ public class MarketServiceImpl implements MarketService {
                             couponOrderRelevanceService.save(couponOrderRelevance);
 
                         } else {
-                            throw new RRException("外部券冲突");
+                            throw new RRException("%与其他优惠冲突", couponCustomerRelevance.getCouponName());
                         }
 
                     });
@@ -1306,7 +1306,7 @@ public class MarketServiceImpl implements MarketService {
                 }
                 //内部券抵扣不了
                 else {
-                    throw new RRException("内部券冲突");
+                    throw new RRException("%与其他优惠冲突", couponCustomerRelevance.getCouponName());
                 }
             };