Merge branch 'feat-IRONFANS-70' into test

api/proto/account/proto/account_vo_api.go

@@ -57,7 +57,7 @@ func (vo *ApiListVO) CopyWallet(wallet *dbstruct.Wallet) *ApiListVO {
 		return vo
 	}
 	vo.GoldNum = wallet.Coins
-	vo.DiamondNum = wallet.WithdrawDiamonds
+	vo.DiamondNum = wallet.Diamonds
 	vo.WithdrawDiamondNum = wallet.WithdrawDiamonds
 	return vo
 }

app/mix/service/logic/vas.go

@@ -1515,6 +1515,13 @@ func (v *Vas) WithdrawApply(ctx *gin.Context, req *vasproto.WithdrawApplyReq) (t
 		return
 	}
 
+	// 扣钻石
+	err = v.store.DecDiamonds(ctx, tx, mid, diamonds)
+	if err != nil {
+		logger.Error("DecDiamonds fail, mid: %, err: %v", mid, err)
+		return
+	}
+
 	// 添加提现订单
 	wOrder = &dbstruct.WithdrawOrder{
 		ID:            goproto.String(orderId),

app/mix/service/vasservice.go

@@ -611,6 +611,7 @@ func (s *Service) OpOrderList(ctx *gin.Context, req *vasproto.OpOrderListReq) (l
 		productIds = append(productIds, id)
 	}
 	productMap, _ := _DefaultVas.GetProductMapByIds(ctx, productIds)
+	logger.Info("GetProductMapByIds, ids: %v, map: %v", productIds, util.ToJson(productMap))
 
 	// 组装
 	for _, o := range orders {