Merge branch 'dev_pigbank2' into develop

# Conflicts:
#	worldsrv/welfmgr.go

worldsrv/trascate_webapi.go

@@ -2945,7 +2945,7 @@ func init() {
 			var msg *webapi.DebugTestReq
 			err := json.Unmarshal(params, &msg)
 			if err != nil {
-				logger.Logger.Error("Unmarshal webapi.PlatfromUpScoreReq error:", err)
+				logger.Logger.Error("Unmarshal webapi.DebugTestReq error:", err)
 				return common.ResponseTag_ParamError, pack
 			}
 
@@ -2955,7 +2955,7 @@ func init() {
 				Message: "未知错误",
 			}
 
-			logger.Logger.Tracef("/api/platform/debug  upScoreReqInfo%v", msg)
+			logger.Logger.Tracef("/api/platform/debug  DebugTestReq%v", msg)
 
 			player := PlayerMgrSington.GetPlayerBySnId(msg.Snid)
 			//玩家在线
@@ -2967,7 +2967,7 @@ func init() {
 
 					if msg.Rpc == 1 {
 						addCoin, _ := strconv.ParseInt(msg.Count, 10, 64)
-						player.AddCoin(addCoin, 0, 5555, "platform", "debug加钻石")
+						player.AddCoin(addCoin, 0, 5555, "platform", "debug加金币")
 						player.SendDiffData()
 						jsonRet.Data.Count = player.Coin
 					} else if msg.Rpc == 2 {

worldsrv/welfmgr.go

@@ -2066,15 +2066,15 @@ func (this *WelfareMgr) DiamondBankTakeCoin(p *Player) (retItemArr []*model.Item
 			Num:  1,
 		})
 
+		retItemArr = append(retItemArr, &model.Item{
+			ItemId:  common.ItemIDDiamond,
+			ItemNum: addDiamond,
+		})
+
 		// 发放奖励道具
 		if infoData.DiamondExc != nil {
 			var items []*model.Item
 
-			retItemArr = append(retItemArr, &model.Item{
-				ItemId:  common.ItemIDDiamond,
-				ItemNum: addDiamond,
-			})
-
 			for _, v := range infoData.DiamondExc {
 				items = append(items, &model.Item{
 					ItemId:  v.ItemId,