后台订单发货

src/server/db/Mysql.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"reflect"
 	"server/GoUtil"
+	"server/MergeConst"
 	"server/conf"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strings"
@@ -458,6 +459,13 @@ func GetPlayerChargeData(OrderSn string) (*SqlChargeOrderStruct, error) {
 	return data, err
 }
 
+func GetPlayerChargeDataList(Uid int) ([]*SqlChargeOrderStruct, error) {
+	sql := "select * from t_player_charge where Uid = ? and PayStatus = ?"
+	data := &[]*SqlChargeOrderStruct{}
+	err := SqlDb.Select(data, sql, Uid, MergeConst.ORDER_STATUS_PAY)
+	return *data, err
+}
+
 func GetPlayerPayChannelOrderId(OrderSn string) (*SqlChargeOrderStruct, error) {
 	sql := "select * from t_player_charge where PayChannelOrderId = ?"
 	data := &SqlChargeOrderStruct{}

src/server/game/Player.go

@@ -275,6 +275,7 @@ func (p *Player) InitPlayer(UserName string) error {
 	p.Login()
 	// GoUtil.RegisterEvent(MergeConst.Notify_Daily_Renew, p.ZeroUpdate, p)
 	// GoUtil.RegisterEvent(MergeConst.Notify_Midday_Renew, p.ZeroUpdate, p)
+	p.OrderShip()
 	SyncFriendMsg(p)
 	p.UpdateUserInfo()
 	// fix bug
@@ -286,8 +287,16 @@ func (p *Player) InitPlayer(UserName string) error {
 	return nil
 }
 
-func (p *Player) Test() {
-	p.PlayMod.getBaseMod().EnergyMul = 100
+func (p *Player) OrderShip() {
+	OrderList, err := db.GetPlayerChargeDataList(int(p.M_DwUin))
+	if err != nil {
+		return
+	}
+	for _, OrderInfo := range OrderList {
+		go TriggerShippingOrder(p, &msg.ReqShippingOrder{
+			OrderSn: OrderInfo.OrderId,
+		})
+	}
 }
 
 // 零点更新

src/server/game/admin.go

@@ -27,6 +27,7 @@ var AdminFuncMap = map[string]func([]interface{}) error{
 	"ReqReload":           ReqReload,
 	"ReqAdminGm":          ReqAdminGm,
 	"ReqAdminBan":         ReqAdminBan,
+	"ReqAdminShipping":    ReqAdminShipping,
 }
 
 func AdminProcess(Func string, args []interface{}) {
@@ -104,6 +105,36 @@ func VerifyUser(accountInfo *db.Db_Account, detail *msg.ReqLogin) (ResLogin *msg
 	}
 	return
 }
+func ReqAdminShipping(args []interface{}) error {
+	a, buf := ParseAdminArgs(args)
+	req := &msg.ReqAdminShipping{}
+	proto.Unmarshal(buf, req)
+	res := make(map[string]interface{})
+	res["Code"] = 0
+	OrderInfo, err := db.GetPlayerChargeData(req.OrderSn)
+	if err != nil {
+		res["Code"] = 1
+		res["Msg"] = "order not found"
+		AdminPlayerBack(a, res)
+	}
+	if OrderInfo.PayStatus == MergeConst.ORDER_STATUS_SHIP {
+		res["Msg"] = "order already shipped"
+		AdminPlayerBack(a, res)
+	}
+	Player := G_GameLogicPtr.GetPlayer(int64(OrderInfo.Uid))
+	if Player == nil {
+		go TriggerShippingOrder(Player, &msg.ReqShippingOrder{
+			OrderSn: req.OrderSn,
+		})
+		res["Msg"] = "player online,triggered sync"
+		AdminPlayerBack(a, res)
+	} else {
+		OrderInfo.PayStatus = MergeConst.ORDER_STATUS_PAY
+		OrderInfo.PayChannelOrderId = req.ChannelOrderSn
+		db.UpdatePlayerChargeData(OrderInfo)
+	}
+	return nil
+}
 
 func AdminPlayerInfo(args []interface{}) error {
 	a, buf := ParseAdminArgs(args)