下单修改

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -191,33 +191,33 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
             } else {
                 if (DateUtil.compareStrDay(DateUtil.getNowTime(), timeStart) == -1) {
-                    orderUtils.backAdvanceCoupon(advanceMap,uid);
+                    orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
                     return ResponseDto.failure(ErrorMapping.get("20011"));//未开始
                 }
             }
             if (DateUtil.compareStrDay(DateUtil.getNowTime(), timeEnd) == 1) {
-                orderUtils.backAdvanceCoupon(advanceMap,uid);
+                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
                 return ResponseDto.failure(ErrorMapping.get("20012"));//已结束
             }
 
             //快递票判断
             if (payOrderParam.getIsExpress() != null) {
                 if (payOrderParam.getIsExpress() == 1 && DateUtil.compareStrDay(DateUtil.getNowTime(), timeExpressEnd) == 1) {
-                    orderUtils.backAdvanceCoupon(advanceMap,uid);
+                    orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
                     return ResponseDto.failure(ErrorMapping.get("20013"));//快递票不卖
                 }
                 if (payOrderParam.getIsExpress() == 1 && payOrderParam.getAddressId().isEmpty()) {
-                    orderUtils.backAdvanceCoupon(advanceMap,uid);
+                    orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
                     return ResponseDto.failure(ErrorMapping.get("20014"));//快递票未填写收货地址
                 }
             }
             //实名判断
             if (isTrueName == 1 && payOrderParam.getEnterIdList().size() <= 0) {
-                orderUtils.backAdvanceCoupon(advanceMap,uid);
+                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
                 return ResponseDto.failure(ErrorMapping.get("20015"));//需要实名 未实名
             }
             if (isTrueName == 1 && payOrderParam.getEnterIdList().size() != payOrderParam.getNumber()) {
-                orderUtils.backAdvanceCoupon(advanceMap,uid);
+                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
                 return ResponseDto.failure(ErrorMapping.get("20015"));//入场人数量错误
             }
 
@@ -240,7 +240,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                             int age = IDCard.getAgeByIdCard(adamEnters.getIdCard());
                             if (age > 25) {
                                 orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
-                                orderUtils.backAdvanceCoupon(advanceMap,uid);
+                                orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
                                 return ResponseDto.failure(ErrorMapping.get("20017"));//年龄超了
                             }
                         }
@@ -253,7 +253,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                         String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, entersVoList.get(i).getIdCard(), payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, 1, 1, memberType, isTrueName);
                         if (!res1.equals("")) {
                             orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
-                            orderUtils.backAdvanceCoupon(advanceMap,uid);
+                            orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
                             return ResponseDto.failure(res1);//乱七八糟异常
                         }
                     }
@@ -261,7 +261,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                     String res1 = orderUtils.judgeOrderLimit(performanceData.getType(), uid, "", payOrderParam.getPerformanceId(), payOrderParam.getTicketId(), performanceLimit, performanceMemberLimit, ticketLimit, ticketMemberLimit, payOrderParam.getNumber(), payOrderParam.getNumber(), memberType, isTrueName);
                     if (!res1.equals("")) {
                         orderUtils.changeSurplus(isPay, payOrderParam.getTicketId(), payOrderParam.getNumber());
-                        orderUtils.backAdvanceCoupon(advanceMap,uid);
+                        orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(),uid);
                         return ResponseDto.failure(res1);//乱七八糟异常
                     }
                 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/OrderUtils.java

@@ -227,9 +227,9 @@ public class OrderUtils {
         return hashMap;
     }
 
-    public void backAdvanceCoupon(HashMap<String, Object> advanceMap,String uid) {
-        if (advanceMap != null) {
-            backCoupon(advanceMap.get("uCouponId").toString(), uid);
+    public void backAdvanceCoupon(String advanceCode,String uid) {
+        if (advanceCode != null) {
+            backCoupon(advanceCode.toString(), uid);
         }
     }