|
|
@@ -47,12 +47,12 @@ function deliver(oJsonInput,ret)
|
|
|
ret.price = oJsonInput.price
|
|
|
--ret.region = oJsonInput.region
|
|
|
ret.err = ""
|
|
|
- if not (ret.account and ret.order and ret.type and ret.id and ret.cnt and ret.region) then
|
|
|
+ if not (ret.account and ret.order and ret.id and ret.cnt ) then -- and ret.type and ret.region
|
|
|
ret.result = 6
|
|
|
ret.err = "param empty"
|
|
|
return ret
|
|
|
end
|
|
|
-
|
|
|
+
|
|
|
if DELIVER_CODE_HIS[oJsonInput.order] then
|
|
|
ret.result = 4
|
|
|
ret.err = "order double"
|
|
|
@@ -70,16 +70,16 @@ function deliver(oJsonInput,ret)
|
|
|
if not humanDb then
|
|
|
ret.result = 2
|
|
|
ret.err = "account not exist"
|
|
|
- return ret
|
|
|
+ return ret
|
|
|
end
|
|
|
end
|
|
|
-
|
|
|
+
|
|
|
if not BuyLogic.checkBuy(human,ret) then
|
|
|
- ret.result = 8
|
|
|
- ret.err = "check buy fail"
|
|
|
- return ret
|
|
|
+ ret.result = 8
|
|
|
+ ret.err = "check buy fail"
|
|
|
+ return ret
|
|
|
end
|
|
|
-
|
|
|
+
|
|
|
oJsonInput.cmd = "deliver"
|
|
|
if online and human.db.middleFlag == nil then
|
|
|
if Config.IS_DEBUG then
|
|
|
@@ -97,11 +97,11 @@ function deliver(oJsonInput,ret)
|
|
|
human.db.buyOrder = human.db.buyOrder or {}
|
|
|
human.db.buyOrder[#human.db.buyOrder + 1] = Util.copyTable(oJsonInput)
|
|
|
end
|
|
|
-
|
|
|
+
|
|
|
RoleDBLogic.saveRole(human.db)
|
|
|
ret.result = 1
|
|
|
Log.write(Log.LOGID_OSS_DELIVER, human.db._id, human.db.account, human.db.name, human.db.lv,oJsonInput.order,oJsonInput.money,oJsonInput.type,oJsonInput.id,oJsonInput.cnt,online and 1 or 0,oJsonInput.region)
|
|
|
- return ret
|
|
|
+ return ret
|
|
|
end
|
|
|
|
|
|
|