update pay

paraengine.sig

@@ -0,0 +1,7 @@
+PARAENGINE_NGISIHZIXIL_VER0001
+======================
+Do NOT edit this file
+======================
+
+This file is the signature file for ParaEngine. It is used for locating the root of ParaEngine executable.
+Currently it is only used for ParaX model exporter. Please only put this file to the root directory. 

wikicraft.csproj

@@ -1277,7 +1277,7 @@
     <Content Include="www\wiki\html\wikiEditor.html" />
     <Content Include="www\wiki\html\worksApply.html" />
     <Content Include="www\wiki\index.page" />
-    <Content Include="www\wiki\js\app.js" />
+    <Content Include="www\wiki\js\mod\app.js" />
     <Content Include="www\wiki\js\app\config.js" />
     <Content Include="www\wiki\js\app\controller\contactController.js" />
     <Content Include="www\wiki\js\app\controller\dataSourceController.js" />

www/wiki/models/pay.page

@@ -11,17 +11,22 @@ include_once("./goods.page");
 include_once("./oauth_app.page");
 include_once("./wallet.page");
 
-local pay       = inherit(models.abstract.multi_user_base,gettable("models.pay"));
-local goods     = models.goods:new();
-local oauth_app = models.oauth_app:new();
-local wallet    = models.wallet:new();
-local user      = models.user:new();
+local pay        = inherit(models.abstract.multi_user_base,gettable("models.pay"));
+local tradeno    = inherit(models.abstract.multi_user_base,gettable("models.tradeno"));
+
+local goods      = models.goods:new();
+local oauth_app  = models.oauth_app:new();
+local wallet     = models.wallet:new();
+local user       = models.user:new();
 
 pay.db_name  = "pay";
 pay.apiUrl   = "https://api.pingxx.com/v1/";
 pay.appToken = KEEPWORK["config"]["default"]["threeService"]["pingxx"]["appToken"];
 pay.appId    = KEEPWORK["config"]["default"]["threeService"]["pingxx"]["appId"];
 
+tradeno.db_name = "tradeno";
+tradeno = tradeno:new();
+
 function pay:ctor()
 	-- keepwork username
 	self:addfield("username", "string",false);
@@ -93,13 +98,13 @@ function pay:api_createCharge(params)
 		end
 	end
 
-	self:getTradeNo(resume);
+	tradeno:getTradeNo(resume);
 	local err, trade_no = yield();
 
 	if not trade_no then
 		return errors:wrap(errors.SERVER_INNER_ERROR);
 	end
-
+	log("a")
 	local url       = self.apiUrl .. "charges";
 	local apiParams = {};
 	apiParams.order_no   = trade_no;
@@ -116,10 +121,10 @@ function pay:api_createCharge(params)
 	elseif(apiParams.channel == "wx_pub_qr") then
 		apiParams.extra = {product_id = trade_no};
 	end
-
+	log("b")
 	self:http("POST", url, apiParams, resume);
 	local err, chargeObject = yield();
-
+	log("c")
 	if(not chargeObject) then
 		return errors:wrap(errors.SERVER_INNER_ERROR);
 	end
@@ -137,10 +142,10 @@ function pay:api_createCharge(params)
 	tradeInfo.app_goods_id = query.app_goods_id; 
 	tradeInfo.additional   = query.additional;
 	tradeInfo.create_date  = self:getNow();
-
-	self:db():insertOne({["+trade_no"] = {trade_no}}, tradeInfo, resume);
+	log(tradeInfo, true);
+	self:db():insertOne(tradeInfo, resume);
 	local err, _ = yield();
-
+	log("d")
 	if(not err) then
 		return errors:wrap(nil, chargeObject);
 	else
@@ -162,7 +167,7 @@ function pay:api_spend(params)
 end
 
 function pay:spend(query, callback)
-	self:getTradeNo(resume);
+	tradeno:getTradeNo(resume);
 	local err, trade_no = yield();
 
 	local appGoodsInfo = self:getGoodsInfo(query);
@@ -359,28 +364,29 @@ function pay:http(method, url, params, callback)
 
 	local err, response = yield();
 
-
-
 	if(type(callback) == "function") then
 		callback(err, response);
 	end
 end
 
-function pay:getTradeNo(callback)
-	local trade_no = tostring(math.random(1000000,9999999));
+function pay:getNow()
+	return ParaGlobal.GetDateFormat("yyyy-MM-dd") .. " " .. ParaGlobal.GetTimeFormat("HH:mm:ss");
+end
 
-	self:db():findOne({trade_no = trade_no}, resume);
+function tradeno:getTradeNo(callback)
+	self:db():insertOne({},resume);
 	local err, response = yield();
 
-	if not err and response == nil then
+	if not err then
+		local number = ParaGlobal.GetDateFormat("yyyyMMdd") .. response._id;
+
 		if(type(callback) == "function") then
-			callback(nil, trade_no);
+			callback(nil, number);
 		end
 	else
-		self:getTradeNo(callback);
+		if(type(callback) == "function") then
+			callback(true, nil);
+		end
 	end
-end
 
-function pay:getNow()
-	return ParaGlobal.GetDateFormat("yyyy-MM-dd") .. " " .. ParaGlobal.GetTimeFormat("HH:mm:ss");
 end