Merge branch 'pre' into 'master'

Pre

See merge request !33

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/admin/upush/create.html

@@ -101,9 +101,9 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-2 control-label is-required">推送标题：</label>
+            <label class="col-sm-2 control-label">推送标题：</label>
             <div class="col-sm-10">
-                <input class="form-control" type="text" name="pushTitle" id="pushTitle" required>
+                <input class="form-control" type="text" name="pushTitle" id="pushTitle">
             </div>
         </div>
         <div class="form-group">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/admin/upush/detail.html

@@ -82,7 +82,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-2 control-label is-required">推送标题：</label>
+            <label class="col-sm-2 control-label">推送标题：</label>
             <div class="col-sm-10">
                 <input class="form-control" type="text" name="pushTitle" id="pushTitle" disabled th:value="${UpushDetailsListDao.pushTitle}">
             </div>
@@ -90,7 +90,7 @@
         <div class="form-group">
             <label class="col-xs-2 control-label">推送内容：</label>
             <div class="col-xs-10">
-                <textarea name="pushContent" maxlength="500" class="form-control" rows="3" disabled th:text="${UpushDetailsListDao.pushTitle}"></textarea>
+                <textarea name="pushContent" maxlength="500" class="form-control" rows="3" disabled th:text="${UpushDetailsListDao.pushContent}"></textarea>
             </div>
         </div>
         <div class="form-group">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/admin/service/impl/AdminUpushServiceImpl.java

@@ -256,7 +256,7 @@ public class AdminUpushServiceImpl extends ServiceImpl<AdminUpushMapper, AdminUp
         try {
             IOSBroadcast broadcast = new IOSBroadcast(iosAppkey, iosAppMasterSecret);
             //alert的值设置为字典
-            broadcast.setAlert(adminUpush.getPushTitle(), adminUpush.getPushTitle(), adminUpush.getPushContent());
+            broadcast.setAlert(adminUpush.getPushTitle(), "", adminUpush.getPushContent());
             broadcast.setBadge(0);
             broadcast.setSound("default");
             if (Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE))) {

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

@@ -412,57 +412,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 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());