Merge branch 'feature/v4.7.20' of http://192.168.3.207:8080/qmx/jy into feature/v4.7.20

config_formal/app_172.17.148.50/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-3-7 12:00:00
+2032-3-7 12:00:00

config_formal/app_i2_172.17.145.180/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-3-7 12:00:00
+2032-3-7 12:00:00

config_formal/big_member_1_172.17.145.180/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-3-21 12:00:00
+2032-3-21 12:00:00

config_formal/bigmember_172.17.145.180/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-3-21 12:00:00
+2032-3-21 12:00:00

config_formal/publicapply_172.17.148.50/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-3-7 12:00:00
+2032-3-7 12:00:00

config_formal/publicapply_172.17.4.183/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-3-7 12:00:00
+2032-3-7 12:00:00

config_formal/subscribepay_172.17.4.183/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-3-7 12:00:00
+2032-3-7 12:00:00

config_formal/subscribepay_2_172.17.145.180/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-3-7 12:00:00
+2032-3-7 12:00:00

config_formal/sword_172.17.145.167/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-3-7 12:00:00
+2032-3-7 12:00:00

config_formal/sword_172.17.148.50/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-3-7 12:00:00
+2032-3-7 12:00:00

config_formal/weixin_172.17.145.167/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-3-7 12:00:00
+2032-3-7 12:00:00

config_formal/weixin_172.17.145.180/time.txt

@@ -1,2 +1,2 @@
 #上次修改时间,比当前修改时间小就行
-2022-3-7 12:00:00
+2032-3-7 12:00:00

src/jfw/modules/app/src/app/front/login.go

@@ -596,13 +596,12 @@ func (l *Login) WxLogin() {
 			if qutil.ObjToString((*user)["s_nickname"]) == "" && qutil.ObjToString((*user)["s_jyname"]) == "" {
 				upSet["s_jyname"] = jy.GetUserName("newother", config.Sysconfig["namePrefix"].(string))
 			}
-			go func(userid string) {
-				mongodb.UpdateById("user", BsonIdToSId((*user)["_id"]), map[string]interface{}{
-					"$set": upSet,
-				})
-				ck, _ := l.GetCookie("SESSIONID")
-				usercenter.UpdateBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), userid, ck)
-			}(BsonIdToSId((*user)["_id"]))
+			mongodb.UpdateById("user", BsonIdToSId((*user)["_id"]), map[string]interface{}{
+				"$set": upSet,
+			})
+			ck, _ := l.GetCookie("SESSIONID")
+			//用户中台同步
+			usercenter.UpdateBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), BsonIdToSId((*user)["_id"]), ck)
 
 			returnSign = afterLogin(*user, l.Session(), rid, oid, phoneType, channel, deviceId, false, l.ResponseWriter)
 			return 1

src/jfw/modules/bigmember/src/service/analysis/decision.go

@@ -46,8 +46,8 @@ var ServiceId = 6
 
 //采购单位和中标企业 其他项目明细/类似项目明细
 func (this *Analysis) ProjectInfoByBW() {
-	userId, _ := this.GetSession("userId").(string)
 	defer qutil.Catch()
+	userId, _ := this.GetSession("userId").(string)
 	r := func() Result {
 		if this.Method() != "POST" {
 			return Result{Data: nil, Error_msg: Error_msg_1005}

src/jfw/modules/bigmember/src/service/analysis/potential.go

@@ -589,6 +589,7 @@ type PCInfo struct {
 
 //采购单位
 func analysisData(res []*AggregationsBucket, mycs map[string]interface{}, omyr map[string]interface{}, pcor string) []*PTComs {
+	defer qutil.Catch()
 	var (
 		ADRes_r     []*PTComs
 		entersFifty []string
@@ -626,10 +627,10 @@ func analysisData(res []*AggregationsBucket, mycs map[string]interface{}, omyr m
 			wg.Add(1)
 			wc <- true
 			go func(entersFifty []string) {
+				defer qutil.Catch()
 				defer func() {
 					wg.Done()
 					<-wc
-					qutil.Catch()
 				}()
 				entInfo := entity.GetEntInfo(entersFifty, pcor)
 				lock.Lock()
@@ -669,6 +670,7 @@ func analysisData(res []*AggregationsBucket, mycs map[string]interface{}, omyr m
 
 //采购单位
 func analysisDataByBuyer(res []map[string]interface{}, mycs map[string]interface{}) []*PTComs {
+	defer qutil.Catch()
 	var ADRes = []*PTComs{}
 	var ADRes_r = []*PTComs{}
 	var enters = []string{}
@@ -695,10 +697,10 @@ func analysisDataByBuyer(res []map[string]interface{}, mycs map[string]interface
 				wg.Add(1)
 				wc <- true
 				go func(entersFifty []string) {
+					defer qutil.Catch()
 					defer func() {
 						wg.Done()
 						<-wc
-						qutil.Catch()
 					}()
 					entInfo := entity.GetEntInfoByQYXY(entersFifty, "C")
 					wl.Lock()
@@ -783,6 +785,7 @@ func analysisDataByBuyer(res []map[string]interface{}, mycs map[string]interface
 
 //中标单位
 func analysisDataByWinner(res []map[string]interface{}, mycs map[string]interface{}, omyr map[string]interface{}, pcor string) []*PTComs {
+	defer qutil.Catch()
 	var ADRes = []*PTComs{}
 	var ADRes_r = []*PTComs{}
 	var enters = []string{}
@@ -812,10 +815,10 @@ func analysisDataByWinner(res []map[string]interface{}, mycs map[string]interfac
 				wg.Add(1)
 				wc <- true
 				go func(entersFifty []string, pcor string) {
+					defer qutil.Catch()
 					defer func() {
 						wg.Done()
 						<-wc
-						qutil.Catch()
 					}()
 					entInfo := entity.GetEntInfoByQYXY(entersFifty, pcor)
 					wl.Lock()
@@ -840,10 +843,10 @@ func analysisDataByWinner(res []map[string]interface{}, mycs map[string]interfac
 			wg.Add(1)
 			wc <- true
 			go func(entersFifty []string, pcor string) {
+				defer qutil.Catch()
 				defer func() {
 					wg.Done()
 					<-wc
-					qutil.Catch()
 				}()
 				entInfo := entity.GetEntInfoByQYXY(entersFifty, pcor)
 				wl.Lock()

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

@@ -26,6 +26,7 @@ func (this *UseBalanceStruct) defaultConsume() (r map[string]interface{}, m stri
 func (this *UseBalanceStruct) fileConsume() (r map[string]interface{}, m string, c int) {
 	_fileName := this.Remarks["fileName"].(string)
 	_id := this.Remarks["id"].(string)
+	log.Println("附件下载包。。。。。")
 	BaseMsg := jy.GetBigVipUserBaseMsg(this.UserId, util.Mysql, util.MQFW)
 	log.Println("---:", this.Remarks)
 	if BaseMsg.Status > 0 && BaseMsg.PowerMap[3] {

src/web/staticres/public-pc/js/article-content.js

@@ -12,6 +12,10 @@ var bidNode = {
     showClose: false,
     optionType: 'hover',
     bidinfo: {},
+    portraitLoaded : {
+      winner : false,
+      buyer : false
+    },
     ruleForm: {
       name: '',
       region: '',
@@ -49,12 +53,12 @@ var bidNode = {
       }
     }
     //console.log('大会员'+ goTemplateData.params.isMember, '超级订阅：'  + goTemplateData.params.isVip,'商机管理：' + goTemplateData.params.isEntniche)
-    if(goTemplateData.params.obj.entId) {
-      this.getWinnerFreeData()
-    }
-    if (goTemplateData.params.obj.buyer) {
-      this.getBuyerFreeData()
-    }
+    // if(goTemplateData.params.obj.entId) {
+    //   this.getWinnerFreeData()
+    // }
+    // if (goTemplateData.params.obj.buyer) {
+    //   this.getBuyerFreeData()
+    // }
   },
   methods: {
     onFree(){
@@ -220,10 +224,11 @@ var bidNode = {
     },
     // 采购单位画像免费数据
     getBuyerFreeData: function() {
-      if (goTemplateData.params.isVip || goTemplateData.params.isMember || goTemplateData.params.isEntniche){
+      var _this = this
+      if (goTemplateData.params.isVip || goTemplateData.params.isMember || goTemplateData.params.isEntniche || _this.portraitLoaded.buyer){
         return
       }
-      var _this = this
+      _this.portraitLoaded.buyer = true;
       $.ajax({
         type: 'POST',
         url: '/bigmember/portrait/buyer/miniData',
@@ -232,6 +237,7 @@ var bidNode = {
     },
       success: function(res) {
     	if (res.error_code < 0) {
+          _this.portraitLoaded.buyer = false;
           return
         }
         if (res.data) {
@@ -269,15 +275,19 @@ var bidNode = {
           }
         }
         _this.buyerInfo = res.data
+      },
+      error:function (){
+        _this.portraitLoaded.buyer = false;
       }
     })
     },
     // 中标企业画像免费数据
     getWinnerFreeData: function() {
-      if (goTemplateData.params.isVip || goTemplateData.params.isMember || goTemplateData.params.isEntniche){
+      var _this = this
+      if (goTemplateData.params.isVip || goTemplateData.params.isMember || goTemplateData.params.isEntniche || _this.portraitLoaded.winner){
         return
       }
-      var _this = this
+      _this.portraitLoaded.winner = true;
       $.ajax({
         type: 'POST',
         url: '/bigmember/portrait/winner/miniData',
@@ -286,6 +296,7 @@ var bidNode = {
     },
       success: function(res) {
     	if (res.error_code < 0) {
+        _this.portraitLoaded.winner = false;
           return
         }
         if (res.data) {
@@ -317,7 +328,10 @@ var bidNode = {
           }
         }
         _this.winnerInfo = res.data
-      }
+      } ,
+        error:function (){
+          _this.portraitLoaded.winner = false;
+        }
     })
     },
     // 采购单位画像、企业画像留资弹框

src/web/templates/pc/biddetail_rec.html

@@ -823,6 +823,7 @@
 											popper-class="bidtrggirPover"
 											placement="bottom-start"
 											width="664"
+                      @show="getBuyerFreeData"
 											trigger="hover">
 										<div slot="reference">
 											<div class="cont-cont portrait_img no-show-tip" tip-data="查看采购单位画像">{{.T.obj.buyer}} </div>
@@ -960,6 +961,7 @@
 											popper-class="bidtrggirPover"
 											placement="bottom-start"
 											width="664"
+                      @show="getWinnerFreeData"
 											trigger="hover">
 										<div slot="reference">
 											<div class="cont-cont portrait_img no-show-tip">{{.T.obj.winner}} </div>
@@ -1472,7 +1474,7 @@ var ucbs_source="pc_rec",ucbsId="{{.T.obj.ucbsId}}";
         $('.tabfat').show()
         $(".recoveryfat").show()
         $('.free-download').hide()
-        return 
+        return
       }
 			var bidmember = false
 			var entniche = false