Merge remote-tracking branch 'origin/new_member' into new_member

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

@@ -38,7 +38,7 @@
                 </div>
             </div>
         </div>
-        <div class="form-group" style="display: none">
+        <div class="form-group" >
             <label class="col-sm-3 control-label is-required">手续费：</label>
             <div class="col-sm-8" th:if="*{isRefundPoundage==1}">
                 <div class="radio check-box">
@@ -57,7 +57,7 @@
                 </div>
             </div>
         </div>
-        <div class="form-group" style="display: none">
+        <div class="form-group">
             <label class="col-sm-3 control-label is-required">退优惠券：</label>
             <div class="col-sm-8" th:if="*{isRefundVoucher==1}">
                 <div class="radio check-box">
@@ -76,7 +76,7 @@
                 </div>
             </div>
         </div>
-        <div class="form-group" style="display: none">
+        <div class="form-group">
             <label class="col-sm-3 control-label is-required">快递费：</label>
             <div class="col-sm-8" th:if="*{isRefundExpress==1}">
                 <div class="radio check-box">
@@ -95,19 +95,19 @@
                 </div>
             </div>
         </div>
-        <div class="form-group" style="display: none">
+        <div class="form-group">
             <label class="col-sm-3 control-label">收货人：</label>
             <div class="col-sm-8">
                 <input name="title" th:field="*{orderRefundAddress.name}" class="form-control" type="text" readonly>
             </div>
         </div>
-        <div class="form-group" style="display: none">
+        <div class="form-group">
             <label class="col-sm-3 control-label">电话：</label>
             <div class="col-sm-8">
                 <input name="title" th:field="*{orderRefundAddress.phone}" class="form-control" type="text" readonly>
             </div>
         </div>
-        <div class="form-group" style="display: none">
+        <div class="form-group">
             <label class="col-sm-3 control-label">收货地址：</label>
             <div class="col-sm-8">
                 <input name="title" th:field="*{orderRefundAddress.address}" class="form-control" type="text" readonly>

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

@@ -380,9 +380,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             couponsAdvance.setCouponPrice(BigDecimal.ZERO);
             couponsAdvance.setCreatedAt(now);
             couponsList.add(couponsAdvance);
-
             sqlsDataE.add(new Object[]{
-                    orderTicketId, payOrderParam.getVoucherCode(), typeVoucher, priceVoucher, now, now
+                    orderTicketId, payOrderParam.getAdvanceCode(), typeVoucher, priceVoucher, now, now
             });
         }