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

src/jfw/front/frontRouter.go

@@ -233,7 +233,7 @@ func (this *CommonRouter) doPcBigPage(pageSign, types string) error {
 	if !strings.Contains(pageSign, "nzj") && !strings.Contains(pageSign, "supply") &&
 		!strings.Contains(pageSign, "unit_portrayal") && !strings.Contains(pageSign, "ent_portrait") &&
 		!strings.Contains(pageSign, "ent_ser_portrait") && !strings.Contains(pageSign, "search/sun") &&
-		!strings.Contains(pageSign, "doc/api") &&
+		!strings.Contains(pageSign, "doc/api") && pageSign != "free/report/preview" &&
 		userid == "" {
 		return this.Redirect("/notin/page")
 	}

src/jfw/front/login.go

@@ -223,6 +223,10 @@ func (l *Login) Login() error {
 						redis.Del("limitation", fmt.Sprintf("firstVisitTagByWX_%s", l.Session().Id()))
 						//用户日志保存
 						referer := l.Refer()
+						var Rref = l.GetString("rref")
+						if l.GetSession("RReferer") != nil && qutil.ObjToString(l.GetSession("RReferer")) != "" {
+							Rref = gconv.String(l.GetSession("RReferer"))
+						}
 						go jy.SaveUserLog(public.Mgo_Log,
 							_id,
 							phone,
@@ -230,7 +234,7 @@ func (l *Login) Login() error {
 							"pc",
 							source,
 							"",
-							jyutil.GetSearchEngine(gconv.String(l.GetSession("RSource"))),
+							Rref,
 							gconv.String(sessVal["RSource"]),
 							qutil.GetIp(l.Request),
 							l.UserAgent(),

src/jfw/modules/app/src/web/staticres/jyapp/commonPay/css/public.css

@@ -451,6 +451,12 @@ button[disabled] {
   color: #fb483d;
 }
 
+.weui-dialog__hd {
+  padding: 0.4rem 0.4rem 0;
+  font-size: .32rem;
+  color: #171826;
+}
+
 .weui-skin_android .weui-dialog__bd,
 .weui-dialog__bd {
   margin: 0.44rem 0.4rem 0.44rem;

src/jfw/modules/app/src/web/templates/commonPay/paySuccess.html

@@ -204,6 +204,21 @@
     {{end}}
         
     </div>
+    <div class="weui-mask" id="weuiMask" style="display: none;"></div>
+    <div class="weui-dialog" id="weuiDialog" style="display: none;">
+        <div class="weui-dialog__hd">
+          报告下载成功
+        </div>
+        <div class="weui-dialog__bd">
+            <p id="weuiDialogContent">
+              报告将于<span class="time"></span>分钟内发送至您的邮箱，您也可前往“资产-报告下载记录”查看详情。
+            </p>
+        </div>
+        <div class="weui-dialog__ft">
+            <a href="javascript:;" id="weuiDialogCancel" class="weui-dialog__btn weui-dialog__btn_default">取消</a>
+            <a href="/jy_mobile/reportanalysis/reportDownload?inside-jumps=1" id="weuiDialogConfirm" class="weui-dialog__btn weui-dialog__btn_primary">查看下载记录</a>
+        </div>
+    </div>
 </div>
 </body>
 <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
@@ -359,6 +374,13 @@
                           $('.header-title').text(document.title)
                           break
                         }
+                        case '投标企业信用报告': {
+                          // var tempNode = $('.info-box.info-item[name="投标企业信用报告"]')
+                          // var tempInfo = JSON.parse(res.data.order.filter)
+                          // tempNode.find('span[name="file-num"]').text('+' + tempInfo.num)
+                          $('#weuiMask').show()
+                          $('#weuiDialog').show()
+                        }
                     }
                 } catch (e) {
                     console.warn(e)
@@ -366,6 +388,24 @@
             }
         }
     })
+    $.ajax({
+      type: 'POST',
+      url: '/subscribepay/config',
+      success: function (res) {
+        if (res && res.error_code === 0 && res.data) {
+          console.log(res.data)
+          $('#weuiDialogContent .time').html(res.data.bidCreditReport_makeTime)
+        }
+      }
+    })
+    $('#weuiDialogCancel').click(function () {
+      $('#weuiDialog').hide()
+      $('#weuiMask').hide()
+    })
+    $('#weuiMask').click(function () {
+      $('#weuiDialog').hide()
+      $('#weuiMask').hide()
+    })
     $(function () {
         try {
             JyObj.hiddenBottom("0");

src/jfw/modules/publicapply/src/config.yaml

@@ -1,6 +1,6 @@
 etcd:
   hosts:
-    - 172.31.31.204:2379
+  - 172.31.31.203:2379
 userCenterKey: "usercenter.rpc" #用户中台rpc
 powerCheckCenterKey: "powercheck.rpc" #权益校验中台
 entManageApplication: "entmanageapplication.rpc" #企业管理中台

src/jfw/modules/subscribepay/src/entity/bidCreditReport/bidCreditReport.go

@@ -3,7 +3,9 @@ package bidCreditReport
 import (
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/es"
+	. "app.yhyue.com/moapp/jybase/mongodb"
 	"bp.jydev.jianyu360.cn/BaseService/pushpkg/p"
+	. "bp.jydev.jianyu360.cn/BaseService/userCenter/identity"
 	"encoding/csv"
 	"errors"
 	"fmt"
@@ -137,6 +139,7 @@ func (b *bidCreditReport) ReportQuery(orderNo string) bool {
 	ctx := gctx.New()
 	orderCode := gconv.String((*datas)[0]["order_code"])
 	entName := gconv.String((*datas)[0]["ent_name"])
+	buyer := gconv.String((*datas)[0]["buyer"])
 	fileName := "/" + b.folderName(bcrId, orderCode, entName) + "/" + entName + ".pdf"
 	downloadUrl := g.Config().MustGet(ctx, "bidCreditReport.visitUrl").String() + fileName
 	r1 := util.Mysql.UpdateOrDeleteBySql(`update jianyu.bid_credit_report set download_url=?,report_url=?,status=2,complete_time=? where id=?`, downloadUrl, reportUrl, gtime.Datetime(), bcrId)
@@ -155,6 +158,8 @@ func (b *bidCreditReport) ReportQuery(orderNo string) bool {
 			"l_createTime": time.Now().Unix(),
 			"s_pdfUrl":     downloadUrl,
 			"bcr_id":       bcrId,
+			"ent":          entName,
+			"buyer":        buyer,
 		},
 	}, true, false)
 	downloadUrl = config.Config.WebDomain + downloadUrl
@@ -182,7 +187,7 @@ func (b *bidCreditReport) ReportQuery(orderNo string) bool {
 	}
 	for _, v := range userMails {
 		go func(vv string) {
-			if b.sendMail(userId, v, entName, gconv.String((*datas)[0]["buyer"]), downloadUrl, orderCode) && userMail == vv {
+			if b.sendMail(userId, v, entName, buyer, downloadUrl, orderCode) && userMail == vv {
 				util.Mysql.UpdateOrDeleteBySql(`update jianyu.bid_credit_report set status=2,send_mail=1,send_mail_time=? where id=?`, gtime.Datetime(), bcrId)
 			}
 		}(v)
@@ -217,6 +222,16 @@ func (b *bidCreditReport) Create(id int64) error {
 	certNo := gconv.String((*datas)[0]["cert_no"])
 	orderNo := gconv.String((*datas)[0]["order_no"])
 	outBizNo := guid.S()
+	mgoUserId := userId
+	if !IsObjectIdHex(mgoUserId) {
+		identity := IdentityByPositionId(util.BaseMysql, gconv.Int64(userId))
+		if identity != nil && identity.UserId > 0 {
+			user, ok := util.MQFW.FindOneByField("user", map[string]interface{}{"base_user_id": identity.UserId}, `{"_id":1}`)
+			if ok && user != nil && len(*user) > 0 {
+				mgoUserId = BsonIdToSId((*user)["_id"])
+			}
+		}
+	}
 	if !g.Config().MustGet(ctx, "bidCreditReport.productEnv").Bool() || garray.NewStrArrayFrom(g.Config().MustGet(ctx, "bidCreditReport.testIds").Strings()).Contains(userId) {
 		outBizNo = "test_" + outBizNo
 	}

src/jfw/modules/subscribepay/src/entity/bidCreditReport/bidCreditReport_test.go

@@ -28,7 +28,7 @@ func TestReportQuery(t *testing.T) {
 }
 
 func TestSendMail(t *testing.T) {
-	BidCreditReport.sendMail("", "wangchuanjin@topnet.net.cn", "芝麻企业信用管理有限公司", "", "https://jybx2-webtest.jydev.jianyu360.com/bidCreditReportFile/%E5%8C%97%E4%BA%AC%E5%89%91%E9%B1%BC%E4%BF%A1%E6%81%AF%E6%8A%80%E6%9C%AF%E6%9C%89%E9%99%90%E5%85%AC%E5%8F%B8.pdf", "abcdef")
+	BidCreditReport.sendMail("", "yangfeng@topnet.net.cn", "芝麻企业信用管理有限公司", "", "https://jybx2-webtest.jydev.jianyu360.com/bidCreditReportFile/%E5%8C%97%E4%BA%AC%E5%89%91%E9%B1%BC%E4%BF%A1%E6%81%AF%E6%8A%80%E6%9C%AF%E6%9C%89%E9%99%90%E5%85%AC%E5%8F%B8.pdf", "abcdef")
 	time.Sleep(time.Minute)
 }
 

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

@@ -48,7 +48,7 @@ func (this *BidCreditReport) EntSearch() {
 func (this *BidCreditReport) GetReport() {
 	adminIdArr := g.Cfg().MustGet(context.TODO(), "bidCreditReport.adminIds").Strings()
 	fool := true
-	userId, _ := this.GetSession("userId").(string)
+	userId, _ := this.GetSession("mgoUserId").(string)
 	for _, adminId := range adminIdArr {
 		if userId == adminId {
 			fool = false
@@ -82,7 +82,7 @@ func (this *BidCreditReport) GetReport() {
 func (this *BidCreditReport) UpdateReport() {
 	adminIdArr := g.Cfg().MustGet(context.TODO(), "bidCreditReport.adminIds").Strings()
 	fool := true
-	userId, _ := this.GetSession("userId").(string)
+	userId, _ := this.GetSession("mgoUserId").(string)
 	for _, adminId := range adminIdArr {
 		if userId == adminId {
 			fool = false

src/web/staticres/common-module/order-list/js/order-list-config.js

@@ -71,7 +71,8 @@ var assetsConf = {
     '剑鱼文库会员',
     '市场分析定制报告下载包',
     '企业中标分析报告下载包',
-    '业主采购分析报告下载包'
+    '业主采购分析报告下载包',
+    '投标企业信用报告'
   ],
   init: function () {
     // this.getPlatform()

src/web/staticres/common-module/order-list/js/order-list.js

@@ -1347,6 +1347,12 @@ var vm = new Vue({
           }
           break
         }
+        case '投标企业信用报告': {
+          var href = assetsConf.bidCreditReportLink.pay[platform]
+          if (href) {
+            this.goToLink(`${href}?orderCode=${orderCode}`)
+          }
+        }
         default: {
           break
         }

src/web/staticres/wxCommonPay/css/public.css

@@ -451,6 +451,12 @@ button[disabled] {
   color: #fb483d;
 }
 
+.weui-dialog__hd {
+  padding: 0.4rem 0.4rem 0;
+  font-size: .32rem;
+  color: #171826;
+}
+
 .weui-skin_android .weui-dialog__bd,
 .weui-dialog__bd {
   margin: 0.44rem 0.4rem 0.44rem;

src/web/templates/order/pc/creditReport/detail.html

@@ -87,9 +87,9 @@
                         <p><span class="hy_text">报告下载份数</span>：<span class="hysl"></span>份<span class="give_num"  style="color:#2CB7CA"></span></p>
                         <!-- <p><span class="year_Text">使用有效期</span>: <span class="year"></span>年</p>
                         <p class="date-row"><span class="zq_text">有效期至</span>：<span class="dyzq"></span></p> -->
-                        <p><span>投标企业名称：</span><span class="bidding-name"></span></p>
-                        <p><span>招标单位名称：</span><span class="buyer-name"></span></p>
-                        <p><span>邮箱：</span><span class="email"></span></p>
+                        <p style="display: none;"><span>投标企业名称：</span><span class="bidding-name"></span></p>
+                        <p style="display: none;"><span>招标单位名称：</span><span class="buyer-name"></span></p>
+                        <p style="display: none;"><span>邮箱：</span><span class="email"></span></p>
                     </div>
                 </div>
             </div>

src/web/templates/structuredata/mobile/marketing_wx.html

@@ -69,11 +69,11 @@
 			</div>
 		</div>
 		<div class="j-button-group">
-			<a ="bindPhoneCustomer()" class="j-button-cancel" id="j_cancel">
+			<a v-bound-phone="bindPhoneCustomer()" class="j-button-cancel" id="j_cancel">
 				<!-- <span class="phone_icon"></span> -->
 				<span>咨询客服</span>
 			</a>
-            <button ="bindPhoneLearnMore()" class="j-button-confirm" id="j_confirm">获取数据样例</button>
+            <button v-bound-phone="bindPhoneLearnMore()" class="j-button-confirm" id="j_confirm">获取数据样例</button>
 		</div>
 	</div>
 	{{include "/common/baiducc.html"}}
@@ -169,7 +169,7 @@
           },
           next: function () {
             window.location.href= href
-          }	
+          }
         }
       },
       bindPhoneCustomer: function() {

src/web/templates/weixin/commonPay/paySuccess.html

@@ -189,6 +189,21 @@
   </button>
 </div>
 {{end}}
+  <div class="weui-mask" id="weuiMask" style="display: none;"></div>
+  <div class="weui-dialog" id="weuiDialog" style="display: none;">
+      <div class="weui-dialog__hd">
+        报告下载成功
+      </div>
+      <div class="weui-dialog__bd">
+          <p id="weuiDialogContent">
+            报告将于<span class="time"></span>分钟内发送至您的邮箱，您也可前往“资产-报告下载记录”查看详情。
+          </p>
+      </div>
+      <div class="weui-dialog__ft">
+          <a href="javascript:;" id="weuiDialogCancel" class="weui-dialog__btn weui-dialog__btn_default">取消</a>
+          <a href="/jy_mobile/reportanalysis/reportDownload?inside-jumps=1" id="weuiDialogConfirm" class="weui-dialog__btn weui-dialog__btn_primary">查看下载记录</a>
+      </div>
+  </div>
 </div>
 </body>
 <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
@@ -316,6 +331,13 @@
                         setAreaPackInfo(JSON.parse(res.data.order.filter))
                         break
                       }
+                      case '投标企业信用报告': {
+                        // var tempNode = $('.info-box.info-item[name="投标企业信用报告"]')
+                        // var tempInfo = JSON.parse(res.data.order.filter)
+                        // tempNode.find('span[name="file-num"]').text('+' + tempInfo.num)
+                        $('#weuiMask').show()
+                        $('#weuiDialog').show()
+                      }
                     }
                 } catch (e) {
                     console.warn(e)
@@ -323,6 +345,24 @@
             }
         }
     })
+    $.ajax({
+      type: 'POST',
+      url: '/subscribepay/config',
+      success: function (res) {
+        if (res && res.error_code === 0 && res.data) {
+          console.log(res.data)
+          $('#weuiDialogContent .time').html(res.data.bidCreditReport_makeTime)
+        }
+      }
+    })
+    $('#weuiDialogCancel').click(function () {
+      $('#weuiDialog').hide()
+      $('#weuiMask').hide()
+    })
+    $('#weuiMask').click(function () {
+      $('#weuiDialog').hide()
+      $('#weuiMask').hide()
+    })
     $(function () {
         var payTime = {{.T.payTime}}
         var price ={{.T.price}}