Merge remote-tracking branch 'origin/feature/v4.9.21' into feature/v4.9.21

src/jfw/modules/app/src/web/templates/big-member/page_orderdetail_member.html

@@ -462,7 +462,7 @@
 
                 //有效周期
                 $(".line_cycle").css("display", "");
-                if (source === ""&&filterObj.badge!="exchange") {
+
                     var pay_again = ""
                     //发票
                     if (r.data.is_can_invoice) {
@@ -476,7 +476,7 @@
                   
                       $('.j-footer').show().html(pay_again);
                     
-                }
+                
                 //支付方式
                 if (r.data.billingMode===1){
                     if (r.data.pay_way.indexOf("wx") > -1||r.data.return_type===1) {

src/jfw/modules/subscribepay/src/service/invoice.go

@@ -481,7 +481,7 @@ func (this *Invoice) ShowinvoiceList() {
 				isReopen = util.Mysql.Count("invoice_fail_record", map[string]interface{}{
 					"only_Identifying": data["only_Identifying"],
 					"order_code":       order_code,
-				}) >= config.InvoiceConfig.SubmitNum
+				})+1 >= config.InvoiceConfig.SubmitNum
 			}
 			data["only_Identifying"] = encrypt.SE.EncodeString(qutil.InterfaceToStr(data["only_Identifying"]))
 			data["isReopen"] = isReopen

src/web/templates/weixin/member/memberdetail.html

@@ -389,10 +389,8 @@
                 $("#card-header-bg").addClass("bg finish-bg")
                 $("#pageTitle").addClass("status")
                 $("#pageTitle").text("已完成");
-
-                //发票//兑换码 不展示支付时间、支付方式、发票、再次购买 p307
-                if (source === ""&&filterObj.badge!="exchange") {
-                  var pay_again = ""
+                
+                var pay_again = ""
                   //有效周期
                   $(".line_cycle").css("display", "");
                   if (r.data.is_can_invoice) {
@@ -404,9 +402,9 @@
                       pay_again += "<button class=\"j-button-cancel\" onclick='checkInvoice(" + r.data.applybill_status + ")'>查看发票</button>"
                   }
                  
-                     $('.j-footer').show().html(pay_again);
-                  
-
+                  $('.j-footer').show().html(pay_again);
+                //发票//兑换码 不展示支付时间、支付方式、发票、再次购买 p307
+                if (source === ""&&filterObj.badge!="exchange") {
                 }else{
                   var buchongbaoHtml = '';
                   var serversName = filterObj.serversName;