Merge branch 'feature/v4.9.21' into dev/v4.9.21_rjj

src/jfw/front/dataExport.go

@@ -356,7 +356,7 @@ func IsAllowInvoice(res map[string]interface{}) bool {
 		(util.IntAll(res["is_backstage_order"]) == 0 || util.InterfaceToStr(res["order_channel"]) == "xdqd04" ||
 			(util.IntAll(res["return_status"]) == 1 && public.Mysql.Count("invoice", map[string]interface{}{
 				"order_code": res["order_code"],
-			}) == 0 && util.InterfaceToStr(res["signing_subject"]) == "北京剑鱼信息技术有限公司")) {
+			}) == 0 && util.InterfaceToStr(res["signing_subject"]) == "h01")) {
 		return true
 	}
 	return false

src/jfw/modules/subscribepay/src/filter/sessionfilter.go

@@ -25,6 +25,7 @@ func (l *sessionfilter) Do() bool {
 		strings.HasPrefix(rqu, "/jypay/free/") || //销售代创建订单
 		strings.HasPrefix(rqu, "/jypay/invoice/submit") || //发票信息提交
 		strings.HasPrefix(rqu, "/jypay/invoice/query") || //发票信息查询
+		strings.HasPrefix(rqu, "/jypay/invoice/newReplace") || //扫码换票
 		rqu == "/jypay/wx/getwxSdkSign" ||
 		rqu == "/jypay/user/company/association" || rqu == "/jypay/getDomain" { //微信js调用参数
 		return true

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

@@ -525,7 +525,7 @@ func (this *Invoice) NewInvoiceShow() {
 	case "1": //订单回显金额
 		data["pay_money"] = ResidueMoney(code)
 	case "2": //发票信息回显
-		invoice := util.Mysql.FindOne("invoice", map[string]interface{}{"id": encrypt.SE.Decode4Hex(code)}, "id,only_Identifying,order_code,invoice_money,invoice_type,invoice_content,invoice_variety,company_name,phone,mail,taxpayer_identnum,invoice_money,invoice_order_money,company_address,bank_name,recipient,delivery_address,bank_account,company_phone", "")
+		invoice := util.Mysql.FindOne("invoice", map[string]interface{}{"id": encrypt.SE.Decode4Hex(code)}, "id,only_Identifying,order_code,invoice_money,remark,invoice_type,invoice_content,invoice_variety,company_name,phone,mail,taxpayer_identnum,invoice_money,invoice_order_money,company_address,bank_name,recipient,delivery_address,bank_account,company_phone", "")
 		if invoice != nil {
 			(*invoice)["id"] = code
 		}
@@ -1395,7 +1395,7 @@ func IsAllowInvoice(res map[string]interface{}) bool {
 		(qutil.IntAll(res["is_backstage_order"]) == 0 || qutil.InterfaceToStr(res["order_channel"]) == "xdqd04" ||
 			(qutil.IntAll(res["return_status"]) == 1 && util.Mysql.Count("invoice", map[string]interface{}{
 				"order_code": res["order_code"],
-			}) == 0 && qutil.InterfaceToStr(res["signing_subject"]) == config.InvoiceConfig.SigningSubject)) {
+			}) == 0 && qutil.InterfaceToStr(res["signing_subject"]) == "h01")) {
 		return true
 	}
 	return false
@@ -1751,7 +1751,7 @@ func (this *Invoice) InvoiceQuery() {
 		case -1: //失败支持重新提交否
 			if !timeLimit {
 				(*invoiceOne)["isReopen"] = util.Mysql.Count("invoice_fail_record", map[string]interface{}{
-					"only_Identifying": (*invoiceOne)["only_Identifying"],
+					"only_Identifying": onlyIdentifying,
 					"order_code":       (*invoiceOne)["order_code"],
 				})+1 >= config.InvoiceConfig.SubmitNum
 			} else {

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

@@ -59,7 +59,7 @@ var (
 // 订单数据展示（订单详情页面）
 func (this *OrderListDetails) GetOrderPayAllMsg() {
 	userId := qutil.ObjToString(this.GetSession("userId"))
-	fields := "id,order_code,order_channel,prepay_time,del_status,create_time,pay_time,pay_way,original_price,order_money,pay_money,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type,discount_price,d_relation_id,billingMode,return_status,is_backstage_order,vip_starttime,vip_endtime,expiration_time,buy_subject,buy_count"
+	fields := "id,signing_subject,order_code,order_channel,prepay_time,del_status,create_time,pay_time,pay_way,original_price,order_money,pay_money,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type,discount_price,d_relation_id,billingMode,return_status,is_backstage_order,vip_starttime,vip_endtime,expiration_time,buy_subject,buy_count"
 	data, t, transaction_id := CommonDetail(4, fields, userId, this.GetString("orderCode"), this.Session())
 	r := &entity.FuncResult{true, nil, map[string]interface{}{
 		"order":          data,
@@ -413,7 +413,7 @@ func (o *OrderListDetails) GetVipOrderInfo() {
 // 企业商机管理详情页
 func (o *OrderListDetails) GetEntnicheDetails() {
 	userId := qutil.ObjToString(o.GetSession("userId"))
-	fields := "id,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,buy_subject,buy_count"
+	fields := "id,signing_subject,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,buy_subject,buy_count"
 	data, _, _ := CommonDetail(3, fields, userId, o.GetString("order_code"), o.Session())
 	o.ServeJson(map[string]interface{}{
 		"data": data,
@@ -837,7 +837,7 @@ func (o *OrderListDetails) IsOver() {
 // 大会员详情订单（AI中标预测包订单详情也查询此接口）
 func (o *OrderListDetails) GetMemberDetail() {
 	userId := qutil.ObjToString(o.GetSession("userId"))
-	fields := "id,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,vip_starttime,vip_endtime,course_status,is_backstage_order,return_status,billingMode,discount_price,buy_subject,buy_count,order_channel"
+	fields := "id,signing_subject,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,vip_starttime,vip_endtime,course_status,is_backstage_order,return_status,billingMode,discount_price,buy_subject,buy_count,order_channel"
 	data, _, _ := CommonDetail(0, fields, userId, o.GetString("order_code"), o.Session())
 	o.ServeJson(map[string]interface{}{
 		"data": data,
@@ -846,7 +846,7 @@ func (o *OrderListDetails) GetMemberDetail() {
 
 func (o *OrderListDetails) GetBidfileDetail() {
 	userId := qutil.ObjToString(o.GetSession("userId"))
-	fields := "id,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,vip_starttime,vip_endtime,course_status,discount_price,d_relation_id,buy_subject,buy_count"
+	fields := "id,signing_subject,order_code,order_status,create_time,pay_time,pay_way,out_trade_no,prepay_id,product_type,pay_money,order_money,filter,applybill_type,applybill_taxnum,applybill_company,applybill_status,vip_starttime,vip_endtime,course_status,discount_price,d_relation_id,buy_subject,buy_count"
 	data, _, _ := CommonDetail(1, fields, userId, o.GetString("order_code"), o.Session())
 	o.ServeJson(map[string]interface{}{
 		"data": data,
@@ -1057,7 +1057,7 @@ func deleteRepeat(slice []int) []int {
 // typ 类型
 // @return sql语句 countsql语句
 func getOrderSql(userId, fromPage, typ string) (string, string) {
-	sql := fmt.Sprintf(`select id,order_code,order_channel,filter_publishtime,create_time,data_spec,filter_id,filter_keys,order_money,pay_money,data_count,order_status,pay_way,product_type,filter,pay_time,vip_starttime,vip_endtime,applybill_status,applybill_type,applybill_taxnum,applybill_company,vip_type,course_status,discount_price,d_relation_id,billingMode,is_backstage_order,return_status,expiration_time,buy_subject,buy_count from dataexport_order
+	sql := fmt.Sprintf(`select id,order_code,order_channel,signing_subject,filter_publishtime,create_time,data_spec,filter_id,filter_keys,order_money,pay_money,data_count,order_status,pay_way,product_type,filter,pay_time,vip_starttime,vip_endtime,applybill_status,applybill_type,applybill_taxnum,applybill_company,vip_type,course_status,discount_price,d_relation_id,billingMode,is_backstage_order,return_status,expiration_time,buy_subject,buy_count from dataexport_order
 		where del_status=0 and audit_status=3 AND ((is_backstage_order =0 AND user_id ='%s')`, userId)
 	sqlC := fmt.Sprintf(`select count(1) from dataexport_order
 		where del_status=0 and audit_status=3 AND ((is_backstage_order =0 AND user_id ='%s')`, userId)

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

@@ -587,7 +587,7 @@ func (o *SalesCreateOrder) GetOrderPayAllMsg() {
 			//	r.Err = errors.New("获取订单信息失败")
 			//	goto env
 			//}
-			field := "id,order_code,del_status,prepay_time,create_time,pay_time,pay_way,user_phone,original_price,order_money,pay_money,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type,discount_price,d_relation_id,billingMode,return_status,is_backstage_order,vip_starttime,vip_endtime"
+			field := "id,signing_subject,order_code,del_status,prepay_time,create_time,pay_time,pay_way,user_phone,original_price,order_money,pay_money,applybill_status,out_trade_no,filter,product_type,order_status,applybill_type,applybill_taxnum,applybill_company,vip_starttime,vip_endtime,vip_type,discount_price,d_relation_id,billingMode,return_status,is_backstage_order,vip_starttime,vip_endtime"
 			data, t, transactionId = CommonDetail(4, field, userId, order_code, o.Session())
 			//如果手机号号为空查找通过userid查找手机号
 			//if qutil.InterfaceToStr(data["user_phone"]) == "" {

src/web/staticres/electronic_invoice/css/check_invoice.css

@@ -148,8 +148,8 @@
   height: 38px;
   line-height: 38px;
   text-align: center;
-  background-color: #BFBFBF;
-  color: white;
+  background-color: #bfbfbf;
+  color: #fff;
   float: left;
   margin-right: 8px;
 }
@@ -167,7 +167,7 @@
   width: 0;
   height: 0;
   border-top: 20px solid transparent;
-  border-left: 23px solid #2CB7CA;
+  border-left: 23px solid #72DAE8;
   border-bottom: 19px solid transparent;
 }
 
@@ -216,7 +216,9 @@
   border-left: 23px solid #2CB7CA;
   border-bottom: 19px solid transparent;
 }
-
+#check_invoice .step .c.finish::after{
+  border-left: 23px solid #72DAE8;
+}
 /* 财务处理*/
 #check_invoice .step .ci {
   position: relative;

src/web/templates/pc/check_invoice.html

@@ -75,9 +75,9 @@
         </div>
         <div class="w step clearfix" v-if="selectinvoice.invoice_status !== -1">
             <!-- 进行中 类名为 active  已完成 类名为 finish  未完成默认颜色-->
-            <div id="l" class="pro l" :class="{'active': selectinvoice.invoice_status === 0 || selectinvoice.invoice_status === 1}">已完成</div>
-            <div id="c" class="pro c" :class="{'active': selectinvoice.invoice_status === 0 || selectinvoice.invoice_status === 1}">财务处理</div>
-            <div id="r" class="pro r" :class="{'active': selectinvoice.invoice_status === 0 || selectinvoice.invoice_status === 1, 'finish': selectinvoice.invoice_status === 1}">发票开具</div>
+            <div id="l" class="pro l active finish">已提交</div>
+            <div id="c" class="pro c" :class="{'active': selectinvoice.invoice_status === 0, 'finish': selectinvoice.invoice_status === 1}">财务处理</div>
+            <div id="r" class="pro r" :class="{'active': selectinvoice.invoice_status === 1}">发票开具</div>
             <div class="rules" data-toggle="modal" data-target="#ruleModal">开票规则</div>
         </div>
         <div class="w step invoice_fail_container" v-else>
@@ -106,28 +106,29 @@
                 <div class="list_tbody">
 					          <p>发票抬头：<span>${selectinvoice.invoice_type}</span></p>
                     <div v-if="selectinvoice.invoice_type == '单位'">
-                      <p class="displaynone company_p">公司名称：<span class="company_name">${selectinvoice.company_name}</span></p>
-                      <p class="displaynone tax_p">单位税号：<span class="tax_num">${selectinvoice.taxpayer_identnum}</span></p>
-                      <p>单位地址：<span class="company_address">${selectinvoice.company_address}</span></p>
-                      <p>电话号码：<span class="phonenum">${selectinvoice.company_phone}</span></p>
-                      <p>开户银行：<span class="bank_name">${selectinvoice.bank_name}</span></p>
-                      <p>银行账号：<span class="bank_account">${selectinvoice.bank_account}</span></p>
-                      <p>开票备注：<span class="remark">${selectinvoice.remark || '-'}</span></p>
+                      <p>公司名称：<span class="company_name">${selectinvoice.company_name || '--'}</span></p>
+                      <p>单位税号：<span class="tax_num">${selectinvoice.taxpayer_identnum || '--'}</span></p>
+                      <p>单位地址：<span class="company_address">${selectinvoice.company_address || '--'}</span></p>
+                      <p>电话号码：<span class="phonenum">${selectinvoice.company_phone || '--'}</span></p>
+                      <p>开户银行：<span class="bank_name">${selectinvoice.bank_name || '--'}</span></p>
+                      <p>银行账号：<span class="bank_account">${selectinvoice.bank_account || '--'}</span></p>
+                      <p>开票备注：<span class="remark">${selectinvoice.remark || '--'}</span></p>
                     </div>
-                    <p>联系电话：<span class="phonenum">${selectinvoice.phone}</span></p>
-                    <p>电子邮箱：<span class="mail">${selectinvoice.mail}</span></p>
-                    <p v-if="selectinvoice.invoice_type == '个人'">开票备注：<span class="remark">${selectinvoice.remark || '-'}</span></p>
+                    <p>联系电话：<span class="phonenum">${selectinvoice.phone || '--'}</span></p>
+                    <p>电子邮箱：<span class="mail">${selectinvoice.mail || '--'}</span></p>
+                    <p v-if="selectinvoice.invoice_type == '个人'">开票备注：<span class="remark">${selectinvoice.remark || '--'}</span></p>
                 </div>
             </div>
             <!-- 状态 -->
             <div class="btn-cells">
               <!-- <p class="backInvoice backP" style="display: none;padding-bottom: 8px;color: red;">系统问题，开票失败</p> -->
-              <button class="btn btn-confirm" id="ing" disabled v-if="selectinvoice.invoice_status == 0" style="border: 0;">开票中</button>
+              <button class="btn btn-confirm" id="ing" disabled v-if="selectinvoice.invoice_status == 0 || selectinvoice.invoice_status == 2">开票中</button>
               <button class="btn btn-confirm" @click="lookInvoice" id="look_invoice" v-if="selectinvoice.invoice_status == 1">查看发票</button>
               <button class="btn btn-cancel" @click="againInvoice('replace')" id="again_invoice" v-if="selectinvoice.invoice_status == 1 && !selectinvoice.changed">换开申请</button>
               <button class="btn btn-confirm" @click="againInvoice('again')" v-if="selectinvoice.invoice_status == -1">再次开票</button>
               <button class="btn btn-confirm" @click="concatKf" v-if="selectinvoice.isReopen">联系客服</button>
-              <p style="text-align: center;font-size: 14px;color: #686868;padding: 12px 0">您申请的发票已由平台开具并发送至您的邮箱，请注意查收。</p>
+              <p v-if="selectinvoice.invoice_status == 0 || selectinvoice.invoice_status == 2" style="text-align: center;font-size: 14px;color: #686868;padding: 12px 0">您申请的发票将在3个工作日内由平台开具并发送至您的邮箱，请注意查收。</p>
+              <p v-if="selectinvoice.invoice_status == 1" style="text-align: center;font-size: 14px;color: #686868;padding: 12px 0">您申请的发票已由平台开具并发送至您的邮箱，请注意查收。</p>
             </div>
         </div>
         <!-- 开票规则弹窗 -->
@@ -442,7 +443,8 @@
             selectinvoice: {},
             loading: true,
             leftBtn: false,
-            rightBtn: true
+            rightBtn: true,
+            invoice_text: ''
           }
         },
         created() {
@@ -536,6 +538,7 @@
               if(currentLeft >= 0) {
                 this.leftBtn = false
                 this.rightBtn = true
+                invoiceStatusList.css('left', 0 + 'px');
                 return;
               }
               this.rightBtn = true
@@ -550,7 +553,7 @@
           },
           // 换开发票
           againInvoice(type) {
-            window.open(`/front/order/invoice/${order_code}?type=${type}&invoiceid=${this.selectinvoice.id}`, '_blank');
+            location.href = `/front/order/invoice/${order_code}?type=${type}&invoiceid=${this.selectinvoice.id}`
           },
           // 封装公共ajax
           ajaxComponent(url, params, contentType) {

src/web/templates/pc/invoice.html

@@ -186,11 +186,10 @@
 	{{include "/common/pcbottom.html"}}
 	{{include "/common/baiducc.html"}}
     <!-- footer -->
-    <script src="{{Msg "seo" "cdn"}}/common-module/public/js/city-picker.data.js"></script>
-    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/city/city-picker.js"></script>
+    <!-- <script src="{{Msg "seo" "cdn"}}/common-module/public/js/city-picker.data.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/city/city-picker.js"></script> -->
     <!-- custom_select.js 为封装select控件 修改原生select样式 -->
-    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/custom_select.js"></script>
-    <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/invoice.js?v={{Msg "seo" "version"}}"></script>
+    <!-- <script src="{{Msg "seo" "cdn"}}/electronic_invoice/js/custom_select.js"></script> -->
 	<script>
 		  $(function(){
         var order_code = {{.T.order_code}};
@@ -521,14 +520,7 @@
                   // 新窗口打开
                   // 判断窗口是不是window.open打开的
                   setTimeout(() => {
-                    if (window.opener && window.opener !== window) {
-                      window.close()
-                    } else {
-                        if (history.length <= 1) {
-                            window.close()
-                        }
-                        history.back()
-                    }
+                    window.location.replace("/front/order/check_invoice/" + order_code)
                   }, 2000)
                 } else {
                   this.loading = false
@@ -540,20 +532,13 @@
               })
             },
             resetForm(formName) {
-              this.ruleForm = {
-                order_code: '',
-                invoice_content: '信息技术服务-技术服务费',
-                invoice_type: '单位',
-                invoice_variety: '电子普通发票',
-                mail: '',
-                phone: '',
-                remark: '',
-                company_name: '',
-                taxpayer_identnum: '',
-                company_address: '',
-                company_phone: '',
-                bank_name: '',
-                bank_account: ''
+              if (window.opener && window.opener !== window) {
+                window.close()
+              } else {
+                if (history.length <= 1) {
+                    window.close()
+                }
+                history.back()
               }
             },
             handleInput(value) {

src/web/templates/pc/myOrder.html

@@ -572,7 +572,7 @@
                       <p><a class="go_pay" data-jy-track="click-hover" @click="goPay(item)">去支付</a></p>
                       <p><a data-jy-track="click-hover" @click="goCancel(item)">取消订单</a></p>
                     </div>
-                    <div v-if="item.order_status === 1 && (item.filter.source || '') === ''&& item.filter.badge!='exchange'">
+                    <div v-if="item.order_status === 1 && item.filter.badge!='exchange'">
                       <!--                                        <div v-if="(item.filter.canInvoice !=undefined  && !item.filter.canInvoice)">-->
                       <p><a v-if="item.is_can_invoice" data-jy-track="click-hover"
                           @click="goInvoice(item)">开发票</a></p>