修改credit

core/src/qfw/front/front.go

@@ -3,8 +3,11 @@ package front
 
 import (
 	"github.com/go-xweb/xweb"
+	"qfw/util"
 )
 
+var se *util.SimpleEncrypt = &util.SimpleEncrypt{Key: "topnet2015topnet2015"}
+
 //注册服务
 func init() {
 	//添加模块解析

core/src/qfw/front/webcentent.go

@@ -150,7 +150,11 @@ func (n *Newscont) viewContent4Front(_id string, temp string) error {
 			time := (*r)["releasetime"]
 			if time != nil && time != "" {
 				time = time.(float64)
-				f := elastic.GetPage("content", "content", `{"releasetime": {"$gt": `+fmt.Sprint(time)+`}, "s_contenttype": "qykb"}`, `"releasetime"`, `{"_id":1,"s_title":1}`, 0, 1)
+				contenttype := "qykb"
+				if (*r)["s_contenttype"] == "zhsk" {
+					contenttype = "zhsk"
+				}
+				f := elastic.GetPage("content", "content", `{"releasetime": {"$gt": `+fmt.Sprint(time)+`}, "s_contenttype": "`+contenttype+`"}`, `"releasetime"`, `{"_id":1,"s_title":1}`, 0, 1)
 				if len(*f) > 0 {
 					for _, v := range *f {
 						if i == 0 {
@@ -161,7 +165,7 @@ func (n *Newscont) viewContent4Front(_id string, temp string) error {
 					}
 				}
 				var j = 0
-				nt := elastic.GetPage("content", "content", `{"releasetime": {"$lt": `+fmt.Sprint(time)+`}, "s_contenttype": "qykb"}`, `{"releasetime":-1}`, `{"_id":1,"s_title":1}`, 0, 1)
+				nt := elastic.GetPage("content", "content", `{"releasetime": {"$lt": `+fmt.Sprint(time)+`}, "s_contenttype": "`+contenttype+`"}`, `{"releasetime":-1}`, `{"_id":1,"s_title":1}`, 0, 1)
 				if len(*nt) > 0 {
 					for _, v := range *nt {
 						if j == 0 {

core/src/qfw/front/weixinshare.go

@@ -5,6 +5,7 @@ import (
 	"github.com/go-xweb/xweb"
 	"qfw/coreutil"
 	"qfw/util/redis"
+	"strconv"
 )
 
 type Weixinshare struct {
@@ -16,11 +17,13 @@ type Weixinshare struct {
 
 func (e *Weixinshare) Weixinshare(pid string) error {
 	var pngdata = []byte{}
+	pid = se.DecodeString(pid)
 	if ret, _ := redis.GetBytes("sso", fmt.Sprintf("p_share_%s", pid)); ret != nil {
 		pngdata = *ret
 	} else {
-		id := coreutil.GetShareId(coreutil.TYPE_INVITE)
-		coreutil.GetShareQR(id)
+		//id := coreutil.GetShareId(coreutil.TYPE_INVITE)
+		id, _ := strconv.Atoi(pid)
+		coreutil.GetShareQR(uint32(id))
 		tmp, _ := redis.GetBytes("sso", fmt.Sprintf("p_share_%d", id))
 		pngdata = *tmp
 	}

core/src/qfw/member/credit/creditdetail.go

@@ -112,6 +112,7 @@ func (c *credit) InCreditAjx() error {
 				cd.UpuserCreditSession(userId, cd.B_FXFWXQ, "B", nil, c.Action)
 			} else {
 				cd.UpuserCreditSession(userId, cd.A_FXFWXQ, "A", nil, c.Action)
+				cd.UpuserCreditSession(userId, cd.B_FXFWXQ, "B", nil, c.Action)
 			}
 		}
 		if param == "qd" {
@@ -137,7 +138,10 @@ func (c *credit) BookInfo() {
 func (c *credit) SessionQdAjx() error {
 	credit_qd := util.ObjToString(c.GetSession("credit_qd"))
 	result := make(M)
+	result["result"] = "n"
 	if credit_qd == "y" {
+		result["result"] = "y"
+		c.ServeJson(result)
 		return nil
 	}
 	userId := util.ObjToString(c.GetSession("userId"))
@@ -146,8 +150,6 @@ func (c *credit) SessionQdAjx() error {
 		if time.Unix(int64(tmp[0]), 0).Day() == time.Now().Day() {
 			c.Session().UpdateByCustomField("id", userId, "credit_qd", "y")
 			result["result"] = "y"
-		} else {
-			result["result"] = "n"
 		}
 	} else {
 		c.Session().UpdateByCustomField("id", userId, "credit_qd", "n")

core/src/qfw/redpackage/redpackage_test.go

@@ -83,7 +83,7 @@ func Test_reissue(t *testing.T) {
 	billno := time.Now().Unix()
 	amount = 500
 	fmt.Println("billno=", billno, ",amount=", amount)
-	bm := qrpc.BonusMsg{Mchbillno: fmt.Sprint(billno),
+	/*bm := qrpc.BonusMsg{Mchbillno: fmt.Sprint(billno),
 		Sendname: coreconfig.RedPackage.Weixin["sendname"].(string),
 		//Reopenid:    "",
 		Totalamount: amount,
@@ -91,6 +91,15 @@ func Test_reissue(t *testing.T) {
 		Wishing:     "企明星幸运有奖",
 		Actname:     "企明星幸运有奖",
 		Remark:      "企明星幸运有奖",
+	}*/
+	bm := qrpc.BonusMsg{Mchbillno: fmt.Sprint(billno),
+		Sendname:    coreconfig.RedPackage.Weixin["sendname"].(string),
+		Reopenid:    "obEpLuCBTu_QlPJhLhJjuVXdwMzE",
+		Totalamount: amount,
+		Totalnum:    1,
+		Wishing:     "企明星新年大抽奖",
+		Actname:     "企明星新年大抽奖",
+		Remark:      "欢迎参加企明星新年大抽奖活动！",
 	}
 	coreutil.PayBonus(&bm)
 }

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-22 16:40:29"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-22 16:40:29"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":720,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-22 17:02:43"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-22 17:02:43"}},"marketisstart":true,"marketrate":300}

core/src/web/staticres/js/enterprise.js

@@ -159,7 +159,7 @@ $(function(){
 	//处理选择样式
 	$("div[id^=c_] li").click(function(){
 		$("li",$(this).closest("div")).removeClass("text-primary");
-		$(this).addClass("text-primary");
+		//$(this).addClass("text-primary");
 	})
 	//搜索关键字
 	var words=""

core/src/web/templates/common/memberleft.html

@@ -104,7 +104,7 @@
 			<div><i class="glyphicon jinbi" style="width:25px;color:red;font-size:18px"></i><span style="font-weight:normal;">{{session "i_credit"}}</span></div>
 		</div>
 		<div style="height:40px;float:left;width:1px;background-color:#DDDDDD"></div>
-		<div style="float:left;width:105px;">
+		<div onclick="window.location.href='/member/accountset/index'" style="float:left;width:105px;">
 			<div>认证</div>
 			<div>
 			{{if session "identType"}}
@@ -112,14 +112,20 @@
 				{{if eq 1 $identType}}
 					{{if eq 1 $identWay}}
 					<i class="glyphicon qyrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">已认证企业</span>
+					{{else}}
+					<i class="glyphicon qyrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证企业</span>
 					{{end}}
 				{{else if eq 2 $identType}}
 					{{if eq 1 $identWay}}
 					<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">已认证个人</span>
+					{{else}}
+					<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证个人</span>
 					{{end}}
 				{{else if eq 3 $identType}}
 					{{if eq 1 $identWay}}
 					<i class="glyphicon jgrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">已认证机构</span>
+					{{else}}
+					<i class="glyphicon jgrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证机构</span>
 					{{end}}
 				{{else}}
 				<i class="glyphicon grrz" style="width:25px;color:red;font-size:18px;margin-right:0px;"></i><span style="font-weight:normal;">未认证</span>

core/src/web/templates/member/credit/mycredit.html

@@ -101,7 +101,7 @@
 								<td width="10%" align="center">
 								<span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
 								<td width="30%" style="padding:110px">
-								去 <button class="btn btn-primary" onclick="toUrl('/member/accountset/index')">完成验证</button></td>
+								去 <button class="btn btn-primary" onclick="toUrl('/member/accountset/index')" style="padding-top:3px;padding-bottom:3px;">完成验证</button></td>
 								{{end}}
 							</tr>
 							<tr class="rowone">
@@ -134,7 +134,7 @@
 								<td width="30%" style="padding:110px"></td>
 								{{else}}
 								<td width="10%" align="center"><span class="n-ok-sign bootstrap-glyphicon glyphicon-ok-sign"></span> 未完成</td>
-								<td width="30%" style="padding:110px">去 <button class="btn btn-primary" onclick="toUrl('/member/yellowpage/show/enterprise/{{.T.user.s_enterpriseid}}')">完善资料</button></td>
+								<td width="30%" style="padding:110px">去 <button class="btn btn-primary" onclick="toUrl('/member/yellowpage/show/enterprise/{{.T.user.s_enterpriseid}}')" style="padding-top:3px;padding-bottom:3px;">完善资料</button></td>
 								{{end}}
 							</tr>
 							<tr class="rowtwo">

core/src/web/templates/search/enterpriseList.html

@@ -86,15 +86,15 @@
 										{{ if eq (index $v "s_action") "01"}}
 											<span class="glyphicon qyrz   margin-l-10 jhtb"></span><span class="lineb " ><small>&nbsp;已认证企业&nbsp;</small></span>
 											{{ if $v.i_comauthenttype }}
-													{{ if eq $v.i_comauthenttype 2}}
-														<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
-													{{else if eq $v.i_comauthenttype 1}}
-														<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
-													{{else if eq $v.i_comauthenttype 3}}
-														<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
-													{{end}}
-											{{else}}
+												{{ if eq $v.i_comauthenttype 2}}
+													<span class="glyphicon mprz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">名片认证</small></span>					
+												{{else if eq $v.i_comauthenttype 1}}
 													<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
+												{{else if eq $v.i_comauthenttype 3}}
+													<span class="glyphicon yjrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-right:5px;">年报邮箱认证</small></span>
+												{{end}}
+											{{else}}
+												<span class="glyphicon yyzzrz   margin-r-10 jhtbtype"></span><span class="lineb " ><small style="margin-left:3px;margin-right:5px;">营业执照认证</small></span>
 											{{end}}
 										{{else if eq (index $v "s_action") "02"}}
 											<span class="glyphicon grrz   margin-l-10 jhtb"></span><span class="lineb " ><small>　已认证个人</small></span>

core/src/web/templates/service/detail.html

@@ -41,6 +41,44 @@
 		    margin-left: -47px;
    		 margin-right: -15px;
 	}
+	.white_content {
+	display: none;
+	position: absolute;
+	top: 25%;
+	left: 25%;
+	width: 55%;
+	height: 55%;
+	padding: 20px;
+	border: 5px solid #dd4814;
+	background-color: white;
+	z-index: 1002;
+	overflow: auto;
+}
+.black_overlay {
+	display: none;
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	background-color: black;
+	z-index: 1001;
+	-moz-opacity: 0.8;
+	opacity: .80;
+	filter: alpha(opacity=88);
+}
+.closeshowmap{
+ 	display: none; 
+    position: absolute; 
+    top: 25%; 
+    left: 79%; 
+    float:right;
+    margin:5px 5px 0px 0px; 
+    background-color: white; 
+    z-index:1003; 
+    overflow: auto; 	
+}
+
 	</style>
 <link href="/css/index-new.css" rel="stylesheet">
 </head>
@@ -148,7 +186,9 @@
 				        {{end}}
 						</div>
 		 				<div class="margin-b-5 m-linkman">
+							{{if .T.einfo.s_persion}}
 							<span class="glyphicon ren2 icon_gray text-muted"  ></span><span class="margin-r-10 text-muted">{{.T.einfo.s_persion}}</span>
+							{{end}}
 							{{if .T.sinfo.s_phone}}	
 								<span class="glyphicon shouji icon_gray text-muted"  ></span><span class="margin-r-10 text-muted">{{.T.einfo.s_mobile}}</span>
 							{{end}}	
@@ -159,10 +199,12 @@
 							{{if .T.einfo.s_qq}}
 							<span class="glyphicon qq1 icon_gray  text-muted"  ></span><span class="text-muted"><a href="tencent://message/?uin={{.T.einfo.s_qq}}&Site=hexun.com/ngdao&Menu=yes" class="margin-r-10"><img src="/images/u124.png" style="margin-top:-10px;cursor:pointer;" /></a></span>
 							{{end}}
-							<br/><span class="glyphicon dizhi icon_gray  text-muted"  ></span><span class="text-muted"><span id="de-address"></span><a href="javascript:void(0)" onclick="showMap()">查看详细地图</a>
+							{{if .T.einfo.i_province}}
+							<br/><span class="glyphicon dizhi icon_gray  text-muted"  ></span><span class="text-muted"><span id="de-address"></span><a href="javascript:void(0)" onclick="showMap()" style="color:#000;">&nbsp;查看详细地图</a>
 								<input id="location" type="hidden" value="">
 								<input id="cityname" type="hidden" value="">
 							</span><br/>
+							{{end}}
 						</div>
 		 			</div>
 		 </div>
@@ -635,21 +677,28 @@ function comment(){
 						if(temp1["k"]==i_province){
 							var temp1c=temp1["s"]
 							if (i_city=="0"){
+								$("#location").val(address);
 								address=temp1["n"]+address;
 								$("#de-address").text(address);
+								$("#cityname").val(temp1["n"]);
 							}
 							for(var j=0;j<temp1c.length;j++){
 								 var temp2=temp1c[j];
 								  if(temp2["k"]==i_city){
 										if(typeof(temp2["s"])=="undefined"){
+											$("#location").val(address);
 											address=temp1["n"]+temp2["n"]+address;
 											$("#de-address").text(address);
+											$("#cityname").val(temp1["n"]+temp2["n"]);
 										}else{
 											var temp2c=temp2["s"];
 											for(var k=0;k<temp2c.length;k++){
 													temp3=temp2c[k];
 													if(temp3["k"]=i_area){
+														$("#location").val(address);
+														
 														address=temp1["n"]+temp2["n"]+temp3["n"]+address;
+														$("#cityname").val(temp1["n"]+temp2["n"]+temp3["n"]);
 														$("#de-address").text(address);
 														break;
 												}

core/src/web/templates/swordfish/infolist.html

@@ -107,9 +107,9 @@ $(function(){
 				}
 				var datatype = $(this).parents("#ycwords").attr("datatype");
 				if(datatype == "bid"){
-					datatype = "【中标】";
+					datatype = "【中标公告】";
 				}else if(datatype == "tender"){
-					datatype = "【招标】";
+					datatype = "【招标公告】";
 				}else{
 					datatype = "";
 				}
@@ -242,9 +242,9 @@ function loadMore(){
 				if($(this).children(".time-diff").length == 0){
 					var datatype = $(this).parents("#ycwords").attr("datatype");
 					if(datatype == "bid"){
-						datatype = "【中标】";
+						datatype = "【中标公告】";
 					}else if(datatype == "tender"){
-						datatype = "【招标】";
+						datatype = "【招标公告】";
 					}else{
 						datatype = "";
 					}

core/src/web/templates/swordfish/wxpush.html

@@ -32,10 +32,13 @@ $(function(){
 			var html = $(this).html();
 			for(var i=0;i<s_words.length;i++){
 				if(s_words[i] != ""){
-					var reg = new RegExp(s_words[i],"gm");
-					html = html.replace(reg,function(word){
-						return '<font class="keyword">'+word+'</font>';
-					});
+					var wordsArray = s_words[i].split("+");
+					for(var si=0;si<wordsArray.length;si++){
+						var reg = new RegExp(wordsArray[si],"gm");
+						html = html.replace(reg,function(word){
+							return '<font class="keyword">'+word+'</font>';
+						});
+					}
 				}
 			}
 			$(this).html(html);

core/src/web/templates/yellowpage/enterpriseinfo.html

@@ -36,7 +36,7 @@
 						{{if eq $identaction "01"}}
 						<script>entType="企业"</script>
 							<span class="glyphicon qyrz"></span>
-							已认证企业{{if .T.res.i_comauthenttype}}{{if eq .T.res.i_comauthenttype 2}}<font class="margin-lr-5">-</font><span class="glyphicon mprz"></span>名片认证{{else if eq .T.res.i_comauthenttype 1}}<font class="margin-lr-5">-</font><span class="glyphicon yyzzrz"></span>营业执照认证{{else if eq .T.res.i_comauthenttype 3}}<font class="margin-lr-5">-</font><span class="glyphicon yjrz"></span>年报邮箱认证{{end}}{{end}}
+							已认证企业{{if .T.res.i_comauthenttype}}{{if eq .T.res.i_comauthenttype 2}}<font class="margin-lr-5">-</font><span class="glyphicon mprz"></span>名片认证{{else if eq .T.res.i_comauthenttype 1}}<font class="margin-lr-5">-</font><span class="glyphicon yyzzrz"></span>营业执照认证{{else if eq .T.res.i_comauthenttype 3}}<font class="margin-lr-5">-</font><span class="glyphicon yjrz"></span>年报邮箱认证{{end}}{{else}}<font class="margin-lr-5">-</font><span class="glyphicon yyzzrz"></span>营业执照认证{{end}}
 						{{else if eq $identaction "02"}}
 						<script>entType="商家"</script>
 							<span class="glyphicon grrz"></span>已认证个人

weixin/src/qfw/weixin/dao/sharedao.go

@@ -4,6 +4,7 @@ package dao
 import (
 	"fmt"
 	. "gopkg.in/mgo.v2/bson"
+	"log"
 	"qfw/util/credit"
 	. "qfw/util/mongodb"
 	"sync"
@@ -11,14 +12,16 @@ import (
 )
 
 //锁
-var sharelock *sync.Mutex
+var sharelock *sync.Mutex = &sync.Mutex{}
 
 //保存用户邀请关系,走线程池
 func SaveInviteLink(shareid string, myopenid string) {
+	log.Println("save user invitelink ", myopenid, shareid)
 	//先找邀请人信息
 	sharelock.Lock()
 	ret := FindOne("person_share", M{"i_shareid": shareid})
 	if *ret == nil {
+		log.Println("wu share info!!!!")
 		sharelock.Unlock()
 		return
 	}
@@ -34,11 +37,13 @@ func SaveInviteLink(shareid string, myopenid string) {
 	//取用户ID
 	ret = FindOne("user", M{"s_m_openid": source_opendid})
 	if *ret == nil {
+		log.Println("no found user!!!!")
 		sharelock.Unlock()
 		return
 	}
 	smid := fmt.Sprintf("%x", string(((*ret)["_id"]).(ObjectId)))
 	//积分处理,RPC
+	log.Println("smid:::", smid)
 	credit.InCreditB(smid, credit.C_TG, nil)
 	sharelock.Unlock()
 }

weixin/src/qfw/weixin/subscribehandler.go

@@ -49,7 +49,7 @@ func SubscribeHandler(w ResponseWriter, r *Request) {
 	} else {
 		source = ""
 	}
-
+	log.Println("source::", source, "flag:::", flag)
 	if digitreg.MatchString(source) {
 		dao.SaveSubscribeLogs(openid, unionid, bindweixin, "wangzhan", "subscribe")
 		if flag == 1 {