修改订单发货接口

src/server/MergeConst/ErrorCode.go

@@ -98,6 +98,6 @@ const G_Champion_People_Cnt = 50
 const (
 	ORDER_STATUS_IDLE   = 0 // 订单未完成
 	ORDER_STATUS_PAY    = 1 // 订单已支付
-	ORDER_STATUS_CANCLE = 2 // 订单取消
+	ORDER_STATUS_CANCEL = 2 // 订单取消
 	ORDER_STATUS_SHIP   = 3 // 订单已发货
 )

src/server/game/PlayerFunc.go

@@ -403,7 +403,6 @@ func CreateOrderSn(p *Player, ChargeId int, Platform, Channel string) (string, e
 }
 
 func GoogleVerify(p *Player, OrderSn, ProduceId, Token string) (*db.SqlChargeOrderStruct, error) {
-
 	Order, err := db.GetPlayerChargeData(OrderSn)
 	if err != nil {
 		return nil, err
@@ -450,6 +449,22 @@ func GoogleVerify(p *Player, OrderSn, ProduceId, Token string) (*db.SqlChargeOrd
 	return Order, nil
 }
 
+func CancelOrder(p *Player, OrderSn string) error {
+	Order, err := db.GetPlayerChargeData(OrderSn)
+	if err != nil {
+		return err
+	}
+	if Order.PayStatus != MergeConst.ORDER_STATUS_PAY {
+		return fmt.Errorf("订单未支付")
+	}
+	Order.PayStatus = MergeConst.ORDER_STATUS_CANCEL
+	err = db.UpdatePlayerChargeData(Order)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func BackUserInfo(p *Player) {
 	BaseMod := p.PlayMod.getBaseMod()
 	FaceMod := p.PlayMod.getFaceMod()

src/server/game/RegisterNetworkFunc.go

@@ -2192,6 +2192,14 @@ func ReqShippingOrder(args []interface{}) error {
 	req := &msg.ReqShippingOrder{}
 	proto.Unmarshal(buf, req)
 	OrderSn := req.OrderSn
+	Status := int(req.Status)
+	if Status != MergeConst.ORDER_STATUS_CANCEL { // 取消支付
+		CancelOrder(player, OrderSn)
+		player.PushClientRes(&msg.ResShippingOrder{
+			Code: msg.RES_CODE_SUCCESS,
+		})
+		return nil
+	}
 	OrderData, err := GoogleVerify(player, OrderSn, req.ProduceId, req.Token)
 	if err != nil {
 		return err