记得上下班打卡 | git大法好,push需谨慎

Commit 633754be authored by 胡佳晨's avatar 胡佳晨

修改判断 从如果是会员 或者 用了券就可以走会员时间,改为如果是老会员或者会员券的情况下还得是会员购买逻辑才可以走会员时间

parent 72c1aa15
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">支付文案:</label> <label class="col-sm-3 control-label is-required">支付文案:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="payTxt" th:value="${ticket.payTxt}" onkeyup="value=value.replace(/[^\w\u4E00-\u9FA5]/g, '')" class="form-control" type="text" maxlength="16"> <input name="payTxt" th:value="${ticket.payTxt}" class="form-control" type="text" maxlength="16">
</div> </div>
<button type="button" class="btn btn-w-m btn-success" onclick="submitHandler(this)"> <button type="button" class="btn btn-w-m btn-success" onclick="submitHandler(this)">
保存 保存
......
...@@ -250,7 +250,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -250,7 +250,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
} }
} }
if (isMember || advanceMap != null) { if ((isOldMember || advanceMap != null) && memberType == 1) {
if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == -1) { if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == -1) {
orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid); orderUtils.backAdvanceCoupon(payOrderParam.getAdvanceCode(), uid);
return ResponseDto.failure(ErrorMapping.get("20011"));//未开始 return ResponseDto.failure(ErrorMapping.get("20011"));//未开始
...@@ -613,7 +613,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -613,7 +613,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
if (orderTickets.getPriceActual().compareTo(BigDecimal.valueOf(0)) > 0) { if (orderTickets.getPriceActual().compareTo(BigDecimal.valueOf(0)) > 0) {
String name = dataUtils.getTicketPayTxt(ticketData.getTicketsId()); String name = dataUtils.getTicketPayTxt(ticketData.getTicketsId());
if(name.equals("")){ if (name.equals("")) {
name = "正在现场"; name = "正在现场";
} }
// 调用支付 // 调用支付
...@@ -741,7 +741,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ ...@@ -741,7 +741,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
KylinOrderTicketEntitiesVo entitiesData = orderTicketData.getEntitiesVoList().get(0); KylinOrderTicketEntitiesVo entitiesData = orderTicketData.getEntitiesVoList().get(0);
String name = dataUtils.getTicketPayTxt(orderTicketData.getTicketId()); String name = dataUtils.getTicketPayTxt(orderTicketData.getTicketId());
if(name.equals("")){ if (name.equals("")) {
name = "正在现场"; name = "正在现场";
} }
LinkedMultiValueMap<String, String> httpData = ObjectUtil.cloneLinkedMultiValueMapStringAndString(); LinkedMultiValueMap<String, String> httpData = ObjectUtil.cloneLinkedMultiValueMapStringAndString();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment