Merge branch 'test'

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/detail.html

@@ -58,7 +58,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label">会员卡ID：</label>
                 <div class="col-sm-8">
-                    <input name="memberNo" th:field="*{adamMemberOrderVo.memberId}" class="form-control" type="text" readonly>
+                    <input name="memberNo" th:field="*{adamUserMemberVo.memberNo}" class="form-control" type="text" readonly>
                 </div>
             </div>
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/order/orderList/order.html

@@ -35,6 +35,7 @@
                             <li>
                                 <label>购买方式：</label>
                                 <select name="mode" th:with="type=${@dict.getType('zhengzai_buy_mode')}">
+                                    <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>

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

@@ -218,7 +218,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     LocalDateTime refundOpenDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundOpenTime());
                     LocalDateTime refundCloseDate = DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceVo.getRefundCloseTime());
                     if (LocalDateTime.now().isAfter(refundOpenDate) && LocalDateTime.now().isBefore(refundCloseDate) && orderTicketVo.getExpressAddress().trim().equals("")
-                            && ticketVo.getCounts() == 1 && lockPrice.compareTo(orderTicketVo.getPriceActual()) == 0) {
+                            && ticketVo.getCounts() == 1 && lockPrice.compareTo(orderTicketVo.getPriceActual()) != 0) {
                         vo.setIsCanRefund(1);
                     } else {
                         vo.setIsCanRefund(0);