admin

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

@@ -187,9 +187,9 @@
     function changeInfo(changeBtn) {
         var tr = $(changeBtn).parent().parent();//tr对象
         tr.find('td').each(function (i, td) {
-            if ($(td).find("input").attr("name") == "priceDiscountMember") {//过滤修改列
-                $(td).find("input").removeAttr("readonly")
-            }
+            // if ($(td).find("input").attr("name") == "priceDiscountMember") {//过滤修改列
+            //     $(td).find("input").removeAttr("readonly")
+            // }
             if ($(td).find("input").attr("name") == "memberLimitCount") {//过滤修改列
                 $(td).find("input").removeAttr("readonly")
             }

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/service/impl/CandyCouponServiceImpl.java

@@ -65,7 +65,7 @@ public class CandyCouponServiceImpl implements ICandyCouponService {
                 myCoupon.add(baseVo);
             }
         }
-        //排序
+        //排序 可用->金额->类型->过期时间
         memberCoupon.sort(Comparator.comparing(CandyCouponVo::getState));
         myCoupon.sort(Comparator.comparing(CandyCouponVo::getState));
         vo.setMemberCoupon(memberCoupon);

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

@@ -185,7 +185,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
                 }
             }
 
-            if (isMember) {
+            if (isMember || advanceMap != null) {
                 if (DateUtil.compareStrDay(DateUtil.getNowTime(), memberTimeStart) == -1) {
                     return ResponseDto.failure(ErrorMapping.get("20011"));//未开始
                 }