卡券修改

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

@@ -427,7 +427,7 @@ public class MarketServiceImpl implements MarketService {
                         //抵扣的服务为 作用范围内支付金额最高的服务
                         OrderServe orderServe = this.queryMaxPayPrice(orderManage, serveIds);
 
-                        if(orderServe!=null){
+                        if (orderServe != null) {
                             //如果有属于这个服务的辅助服务 就查出来一起折扣
                             OrderServe supportServe = this.querySupportServe(orderManage, orderServe);
 
@@ -492,8 +492,7 @@ public class MarketServiceImpl implements MarketService {
                                 orderManage.addDiscountPrice(actualSupportServeDiscountAmount);
                                 orderServe.setBindCoupon(1);
                             }
-                        }
-                        else {
+                        } else {
                             couponCustomerRelevance.setOrderId(null);
                             couponCustomerRelevanceMapper.updateById(couponCustomerRelevance);
                         }
@@ -611,7 +610,7 @@ public class MarketServiceImpl implements MarketService {
                 .filter(orderServe -> orderServe.getProduceCurrentPrice() == null)
                 .filter(orderServe -> orderServe.getBindCoupon() != 1)
                 .max(Comparator.comparing(OrderServe::getPayPrice))
-                .orElseThrow(RRException::new);
+                .orElse(null);
     }