Merge branch 'pre' into 'master'

Pre

See merge request !25

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/memberAudit/memberAudit.html

@@ -54,7 +54,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + updateFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>审核</a> ');
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>审核</a> ');
                         return actions.join('');
                     }
                 }]

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

@@ -40,6 +40,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 
@@ -404,6 +405,58 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             if (refundSinglePrice.compareTo(BigDecimal.ZERO) <= 0) {
                 return "申请金额不得小于0";
             }
+
+            // 临时手续费
+            if (orderTicketVo.getPerformanceId().equals("245383231370444809122956")) {
+                // 手续费比例
+                float chargesNum = 0.0f;
+                // 票种演出开始时间
+                String useStart = orderTicketVo.getUseStart();
+                DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                LocalDateTime useStartD = LocalDateTime.parse(useStart, df);
+                // 3、15天之前的时间
+                LocalDateTime useStartD15Before = useStartD.minusDays(15);
+                LocalDateTime useStartD3Before = useStartD.minusDays(3);
+                // 当前时间
+                LocalDateTime nowTime = LocalDateTime.now();
+
+                if (useStartD15Before.isAfter(nowTime)) { // 15天以前的时间大于当前时间 距离演出开始日期>15天
+                    chargesNum = 0.1f;
+                    log.info("距离演出开始日期>15天");
+                    log.info("票种演出开始时间 {}", useStartD);
+                    log.info("15天之前的时间 {}", useStartD15Before);
+                    log.info("3天之前的时间 {}", useStartD3Before);
+                    log.info("当前时间 {}", nowTime);
+                    log.info("手续费比例 {}", chargesNum);
+                } else if (useStartD3Before.isAfter(nowTime)) { // 3天以前的时间大于当前时间 距离演出开始日期>3天-15天 含15天
+                    chargesNum = 0.5f;
+                    log.info("距离演出开始日期3-15天");
+                    log.info("票种演出开始时间 {}", useStartD);
+                    log.info("15天之前的时间 {}", useStartD15Before);
+                    log.info("3天之前的时间 {}", useStartD3Before);
+                    log.info("当前时间 {}", nowTime);
+                    log.info("手续费比例 {}", chargesNum);
+                } else { // 三天以内 <=3
+                    log.info("距离演出开始日期<=3");
+                    log.info("票种演出开始时间 {}", useStartD);
+                    log.info("15天之前的时间 {}", useStartD15Before);
+                    log.info("3天之前的时间 {}", useStartD3Before);
+                    log.info("当前时间 {}", nowTime);
+                    log.info("手续费比例 {}", chargesNum);
+                    return "当前日期不支持退票";
+                }
+                BigDecimal multiply = refundSinglePrice.multiply(BigDecimal.valueOf(chargesNum));
+                log.info("multiply {}", multiply);
+                refundSinglePrice = refundSinglePrice.subtract(multiply);
+                log.info("去除手续费申请金额 {}", refundSinglePrice);
+                if (refundSinglePrice.compareTo(BigDecimal.ZERO) <= 0) {
+                    return "申请金额不得小于0";
+//                    return "去除手续费申请金额不得小于0";
+                }
+            } else{
+                log.info("演出id1111 {}", orderTicketVo.getPerformanceId());
+            }
+            // 临时手续费 end
             Map token = CurrentUtil.getTokenClaims();
             String username = StringUtils.defaultString(((String) token.get("nickname")), "");
             String result = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice.doubleValue(), orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size());