增加积分逻辑

common/src/qfw/util/credit/credit.go

@@ -3,6 +3,7 @@ package credit
 
 import (
 	"fmt"
+	"github.com/go-xweb/xweb"
 	"qfw/util"
 	mogo "qfw/util/mongodb"
 	"qfw/util/rpc"

core/src/timetask.json

@@ -1 +1 @@
-{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-14 16:37:50"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-14 16:37:50"}},"marketisstart":true,"marketrate":300}
+{"comment":{"c_rate":10,"commentrate":900},"market":{"demand":{"attr":["i_hits","i_bids","i_status"],"timepoint":"2016-01-15 10:25:52"},"service":{"attr":["i_hits","i_sales","i_comments","i_score","i_appcounts"],"timepoint":"2016-01-15 10:25:52"}},"marketisstart":true,"marketrate":300}

core/src/web/staticres/wxswordfish/main.js

@@ -151,6 +151,13 @@ function getCredit(){
 	})
 	return score
 }
+var snopshot=[];
+
+function showSnopshot(){
+	//提示扣积分
+	alert(getCredit())
+	$(".credit-tip").show()
+}
 
 function commonAjaxReq(object,module){
 	//是关的不用处理
@@ -161,31 +168,21 @@ function commonAjaxReq(object,module){
 	if($("#"+module+"-on-off").hasClass("open")){
 		//开服务要校验
 		if(module=="tender"){
-			if(!Tender.status){
-				alert(getCredit())
-				//提示扣积分
-				//先取积分，规则然后提示
-				$(".credit-tip").show()
-				//生成快照
-				dataObj[module+"_snopshot"]=true
+			if(typeof(msgset.tender) != "undefined"){
+				if(!msgset.tender.i_switchstatus){
+					snopshot["tender"]=true	
+					showSnopshot()
+				}
 			}
 		}else if(module=="bid"){
-			if(!Bid.status){
-				//提示扣积分
-				alert(getCredit())
-				$(".credit-tip").show()
-				//生成快照
-				dataObj[module+"_snopshot"]=true
+			if(typeof(msgset.bid) != "undefined"){
+				if(!msgset.bid.i_switchstatus){
+					snopshot["bid"]=true
+					showSnopshot()	
+				}
 			}
 		}
-	}else{
-		if(module=="tender"){
-			Tender.status=false
-		}else if(module=="bid"){
-			Bid.status=false
-		}
 	}
-
 	var keysString = "",scopeString = "";
 	var thisClass = this;
 	this.afterCommit = function(){
@@ -252,7 +249,7 @@ function commonAjaxReq(object,module){
 	if(dataObj[module+"_keys"].length > 0 && dataObj[module+"_scope"] == ""){
 		dataObj[module+"_scope"] = "A";
 	}
-	dataObj[module+"_status"] = $("#"+module+"-on-off").hasClass("open")?1:0
+	dataObj[module+"_switchstatus"] = $("#"+module+"-on-off").hasClass("open")?1:0
 	
 	/*****************************************/
 	$.ajax({
@@ -318,17 +315,17 @@ $(function(){
 	if(typeof(msgset.tender) != "undefined"){
 		setKeyWord("tender",msgset.tender.a_key);
 		setScope("tender",msgset.tender.s_scope);
-		if(msgset.tender.i_status){
+		if(msgset.tender.i_switchstatus){
 			turnOn($("#tender-on-off"));
-			Tender.status=true
+			//判断要不要还原提示
 		}
 	}
 	if(typeof(msgset.bid) != "undefined"){
 		setKeyWord("bid",msgset.bid.a_key);
 		setScope("bid",msgset.bid.s_scope);
-		if(msgset.bid.i_status){
+		if(msgset.bid.i_switchstatus){
 			turnOn($("#bid-on-off"));
-			Bid.status=true
+			//判断要不要还原提示
 		}
 	}
 	//开关

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

@@ -10,8 +10,6 @@
 <script src="/wxswordfish/share.js"></script>
 <script>
 	var msgset= {{.T.msgset}};
-	var snopshot_tender= "{{.T.snopshot_tender}}";
-	var snopshot_bid= "{{.T.snopshot_bid}}";
 </script>
 <script src="/wxswordfish/main.js"></script>
 </head>

credit/src/qfw/creditrpc/creditrpc.go

@@ -53,12 +53,12 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 		case "a": //立即生效
 			creditDoc["i_score"] = Score[param.Code]
 			if creditlog.Save(creditDoc) {
-				*replay = 1
+				*replay = creditDoc["i_score"].(int)
 			}
 		case "d", "e":
 			creditDoc["i_score"] = util.If(param.Num > 0, param.Num, Score[param.Code]).(int)
 			if creditlog.Save(creditDoc) {
-				*replay = 1
+				*replay = creditDoc["i_score"].(int)
 			}
 		case "b":
 			key := param.Code + "_" + param.Uid
@@ -86,7 +86,7 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 							redis.Put(consts.RedisDB, key, newobj, GetSubSecond(int(newobj[2]-thist)))
 							redis.Put(consts.RedisDB, daykey, true, GetSubSecond(1))
 							creditlog.AddLog(creditDoc)
-							*replay = 1
+							*replay = creditDoc["i_score"].(int)
 						} else {
 							//不是连续签到
 							bcon = false
@@ -104,7 +104,7 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 						redis.Put(consts.RedisDB, key, newobj, GetSubSecond(int(newobj[2])))
 						redis.Put(consts.RedisDB, daykey, true, GetSubSecond(1))
 						creditlog.AddLog(creditDoc)
-						*replay = 1
+						*replay = creditDoc["i_score"].(int)
 					}
 				}
 			} else {
@@ -119,7 +119,7 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 						redis.Put(consts.RedisDB, key, newobj, GetSubSecond(1))
 						creditDoc["i_score"] = Score[param.Code]
 						creditlog.AddLog(creditDoc)
-						*replay = 1
+						*replay = creditDoc["i_score"].(int)
 					}
 				} else {
 					times := Score[param.Code+"_n"]
@@ -131,7 +131,7 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 					creditDoc["i_score"] = Score[param.Code]
 					redis.Put(consts.RedisDB, key, newobj, GetSubSecond(1))
 					creditlog.AddLog(creditDoc)
-					*replay = 1
+					*replay = creditDoc["i_score"].(int)
 				}
 			}
 			lock.Unlock()
@@ -157,7 +157,7 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 						creditlog.AddLog(creditDoc)
 						creditlog.AddLog(newDoc)
 						redis.Put(consts.RedisDB, key, true, GetSubSecond(1))
-						*replay = 1
+						*replay = creditDoc["i_score"].(int)
 					}
 				}
 			} else if param.Code == "c2" { //评价
@@ -169,14 +169,14 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 						creditDoc["o_param"] = param.OtherParam
 						creditlog.AddLog(creditDoc)
 						redis.Put(consts.RedisDB, key, true, GetSubSecond(1))
-						*replay = 1
+						*replay = creditDoc["i_score"].(int)
 					}
 				}
 			} else {
 				creditDoc["i_score"] = Score[param.Code]
 				creditDoc["o_param"] = param.OtherParam
 				creditlog.AddLog(creditDoc)
-				*replay = 1
+				*replay = creditDoc["i_score"].(int)
 			}
 			lock.Unlock()
 		default: //定时任务
@@ -184,7 +184,7 @@ func (c *CreditRpc) InCreadit(param *qrpc.CreditData, replay *int) error {
 			if sc > 0 {
 				creditDoc["i_score"] = sc
 				creditlog.AddLog(creditDoc)
-				*replay = 1
+				*replay = creditDoc["i_score"].(int)
 			}
 		}
 	}